Use URLs for locating the working directory.

rowanj · tiennou · Jul 12, 2014 · Jul 12, 2014 · Jul 15, 2014 · Jul 15, 2014
commit 56cd7a6d564122f29010c0a6b1025dd59faf134d
diff --git a/Classes/Controllers/PBGitHistoryController.m b/Classes/Controllers/PBGitHistoryController.m
@@ -566,27 +566,24 @@ - (void)showCommitsFromTree:(id)sender
 
 - (void)showInFinderAction:(id)sender
 {
-	NSString *workingDirectory = [[repository workingDirectory] stringByAppendingString:@"/"];
-	NSString *path;
-	NSWorkspace *ws = [NSWorkspace sharedWorkspace];
+	NSURL *workingDirectoryURL = self.repository.workingDirectoryURL;
+	NSMutableArray *URLs = [NSMutableArray array];
 
 	for (NSString *filePath in [sender representedObject]) {
-		path = [workingDirectory stringByAppendingPathComponent:filePath];
-		[ws selectFile: path inFileViewerRootedAtPath:path];
-	}
-
+		[URLs addObject:[workingDirectoryURL URLByAppendingPathComponent:filePath]];
+    }
+    [[NSWorkspace sharedWorkspace] activateFileViewerSelectingURLs:URLs];
 }
 
 - (void)openFilesAction:(id)sender
 {
-	NSString *workingDirectory = [[repository workingDirectory] stringByAppendingString:@"/"];
-	NSString *path;
-	NSWorkspace *ws = [NSWorkspace sharedWorkspace];
+	NSURL *workingDirectoryURL = self.repository.workingDirectoryURL;
+	NSMutableArray *URLs = [NSMutableArray array];
 
 	for (NSString *filePath in [sender representedObject]) {
-		path = [workingDirectory stringByAppendingPathComponent:filePath];
-		[ws openFile:path];
-	}
+        [URLs addObject:[workingDirectoryURL URLByAppendingPathComponent:filePath]];
+    }
+    [[NSWorkspace sharedWorkspace] openURLs:URLs withAppBundleIdentifier:nil options:0 additionalEventParamDescriptor:nil launchIdentifiers:NULL];
 }
 
 - (void) checkoutFiles:(id)sender

diff --git a/Classes/Controllers/PBGitIndexController.m b/Classes/Controllers/PBGitIndexController.m
@@ -210,9 +210,9 @@ - (void) unstageFilesAction:(id) sender
 - (void) openFilesAction:(id) sender
 {
 	NSArray *files = [sender representedObject];
-	NSString *workingDirectory = [commitController.repository workingDirectory];
+	NSURL *workingDirectoryURL = commitController.repository.workingDirectoryURL;
 	for (PBChangedFile *file in files)
-		[[NSWorkspace sharedWorkspace] openFile:[workingDirectory stringByAppendingPathComponent:[file path]]];
+		[[NSWorkspace sharedWorkspace] openURL:[workingDirectoryURL URLByAppendingPathComponent:[file path]]];
 }
 
 - (void) ignoreFilesAction:(id) sender
@@ -244,23 +244,22 @@ - (void) showInFinderAction:(id) sender
 	NSArray *selectedFiles = [sender representedObject];
 	if ([selectedFiles count] == 0)
 		return;
-	NSString *workingDirectory = [[commitController.repository workingDirectory] stringByAppendingString:@"/"];
-	NSString *path = [workingDirectory stringByAppendingPathComponent:[[selectedFiles objectAtIndex:0] path]];
-	NSWorkspace *ws = [NSWorkspace sharedWorkspace];
-	[ws selectFile: path inFileViewerRootedAtPath:nil];
+	NSURL *workingDirectoryURL = commitController.repository.workingDirectoryURL;
+	NSURL *filePath = [workingDirectoryURL URLByAppendingPathComponent:[[selectedFiles objectAtIndex:0] path]];
+
+	[[NSWorkspace sharedWorkspace] activateFileViewerSelectingURLs:@[filePath]];
 }
 
 - (void)moveToTrashAction:(id)sender
 {
 	NSArray *selectedFiles = [sender representedObject];
 
-	NSString *workingDirectory = [commitController.repository workingDirectory];
-	NSURL* workDirURL = [NSURL fileURLWithPath:workingDirectory isDirectory:YES];
+	NSURL *workingDirectoryURL = commitController.repository.workingDirectoryURL;
 
 	BOOL anyTrashed = NO;
-	for (PBChangedFile* file in selectedFiles)
+	for (PBChangedFile *file in selectedFiles)
 	{
-		NSURL* fileURL = [workDirURL URLByAppendingPathComponent:[file path]];
+		NSURL* fileURL = [workingDirectoryURL URLByAppendingPathComponent:[file path]];
 
 		NSError* error = nil;
 		NSURL* resultURL = nil;
@@ -343,14 +342,14 @@ - (BOOL)tableView:(NSTableView *)tv
 
 	// External, to drag them to for example XCode or Textmate
 	NSArrayController *controller = [tv tag] == 0 ? unstagedFilesController : stagedFilesController;
-	NSArray *files = [[controller arrangedObjects] objectsAtIndexes:rowIndexes];
-	NSString *workingDirectory = [commitController.repository workingDirectory];
+	NSArray *files = [controller.arrangedObjects objectsAtIndexes:rowIndexes];
+	NSURL *workingDirectoryURL = commitController.repository.workingDirectoryURL;
 
-	NSMutableArray *filenames = [NSMutableArray arrayWithCapacity:[rowIndexes count]];
+	NSMutableArray *URLs = [NSMutableArray arrayWithCapacity:rowIndexes.count];
 	for (PBChangedFile *file in files)
-		[filenames addObject:[workingDirectory stringByAppendingPathComponent:[file path]]];
+		[URLs addObject:[workingDirectoryURL URLByAppendingPathComponent:file.path]];
 
-	[pboard setPropertyList:filenames forType:NSFilenamesPboardType];
+	[pboard setPropertyList:URLs forType:NSURLPboardType];
     return YES;
 }
 

diff --git a/Classes/Controllers/PBGitWindowController.m b/Classes/Controllers/PBGitWindowController.m
@@ -41,12 +41,7 @@ - (void)synchronizeWindowTitleWithDocumentName
     [super synchronizeWindowTitleWithDocumentName];
 
     // Point window proxy icon at project directory, not internal .git dir
-    NSString *workingDirectory = [self.repository workingDirectory];
-	if (workingDirectory)
-	{
-		[[self window] setRepresentedURL:[NSURL fileURLWithPath:workingDirectory
-													isDirectory:YES]];
-	}
+    [[self window] setRepresentedURL:self.repository.workingDirectoryURL];
 }
 
 - (void)windowWillClose:(NSNotification *)notification
@@ -176,13 +171,13 @@ - (void)showErrorSheetTitle:(NSString *)title message:(NSString *)message argume
 
 - (IBAction) revealInFinder:(id)sender
 {
-	[[NSWorkspace sharedWorkspace] openFile:[repository workingDirectory]];
+	[[NSWorkspace sharedWorkspace] openURL:self.repository.workingDirectoryURL];
 }
 
 - (IBAction) openInTerminal:(id)sender
 {
 	TerminalApplication *term = [SBApplication applicationWithBundleIdentifier: @"com.apple.Terminal"];
-	NSString *workingDirectory = [[repository workingDirectory] stringByAppendingString:@"/"];
+	NSString *workingDirectory = [self.repository.workingDirectoryURL.path stringByAppendingString:@"/"];
 	NSString *cmd = [NSString stringWithFormat: @"cd \"%@\"; clear; echo '# Opened by GitX:'; git status", workingDirectory];
 	[term doScript: cmd in: nil];
 	[NSThread sleepForTimeInterval: 0.1];

diff --git a/Classes/Views/PBRemoteProgressSheet.m b/Classes/Views/PBRemoteProgressSheet.m
@@ -97,7 +97,7 @@ + (void) beginRemoteProgressSheetForArguments:(NSArray *)args
 	[PBRemoteProgressSheet beginRemoteProgressSheetForArguments:args
 														  title:theTitle
 													description:theDescription
-														  inDir:[repo workingDirectory]
+														  inDir:repo.workingDirectoryURL.path
 											   windowController:repo.windowController];
 }
 
@@ -110,7 +110,7 @@ + (void) beginRemoteProgressSheetForArguments:(NSArray *)args
 	[PBRemoteProgressSheet beginRemoteProgressSheetForArguments:args
 														  title:theTitle
 													description:theDescription
-														  inDir:[repo workingDirectory]
+														  inDir:repo.workingDirectoryURL.path
 											   windowController:repo.windowController
 											  hideSuccessScreen:hideSucc];
 }
@@ -162,8 +162,6 @@ - (void) beginRemoteProgressSheetForArguments:(NSArray *)args
 	[gitTask launch];
 }
 
-
-
 #pragma mark Notifications
 
 - (void) taskCompleted:(NSNotification *)notification

diff --git a/Classes/git/PBGitIndex.h b/Classes/git/PBGitIndex.h
@@ -56,6 +56,7 @@ extern NSString *PBGitIndexOperationFailed;
 // Whether we want the changes for amending,
 // or for
 @property BOOL amend;
+@property (weak, readonly) PBGitRepository *repository;
 
 - (id)initWithRepository:(PBGitRepository *)repository;
 

diff --git a/Classes/git/PBGitIndex.m b/Classes/git/PBGitIndex.m
@@ -56,6 +56,8 @@ - (void)postOperationFailed:(NSString *)description;
 
 @implementation PBGitIndex
 
+@synthesize repository=repository; /* WIP: Switch to automatic synthesize */
+
 - (id)initWithRepository:(PBGitRepository *)theRepository
 {
 	if (!(self = [super init]))
@@ -64,11 +66,8 @@ - (id)initWithRepository:(PBGitRepository *)theRepository
 	NSAssert(theRepository, @"PBGitIndex requires a repository");
 
 	repository = theRepository;
-	NSString* workingPath = theRepository.workingDirectory;
-	if (workingPath)
-	{
-		workingDirectory = [NSURL fileURLWithPath:workingPath];
-	}
+    workingDirectory = repository.workingDirectoryURL;
+
 	files = [NSMutableArray array];
 
 	return self;
@@ -455,10 +454,10 @@ - (NSString *)diffForFile:(PBChangedFile *)file staged:(BOOL)staged contextLines
 	if (file.status == NEW) {
 		NSStringEncoding encoding;
 		NSError *error = nil;
-		NSString *path = [[repository workingDirectory] stringByAppendingPathComponent:file.path];
-		NSString *contents = [NSString stringWithContentsOfFile:path
-												   usedEncoding:&encoding
-														  error:&error];
+		NSURL *fileURL = [self.repository.workingDirectoryURL URLByAppendingPathComponent:file.path];
+		NSString *contents = [NSString stringWithContentsOfURL:fileURL
+                                                  usedEncoding:&encoding
+                                                         error:&error];
 		if (error)
 			return nil;
 

diff --git a/Classes/git/PBGitRepository.h b/Classes/git/PBGitRepository.h
@@ -102,8 +102,9 @@ static NSString * PBStringFromBranchFilterType(PBGitXBranchFilterType type) {
 - (BOOL)executeHook:(NSString *)name output:(NSString **)output GITX_DEPRECATED;
 - (BOOL)executeHook:(NSString *)name withArgs:(NSArray*) arguments output:(NSString **)output GITX_DEPRECATED;
 
-- (NSString *)workingDirectory;
-- (NSString *) projectName;
+- (NSString *)workingDirectory GITX_DEPRECATED;
+- (NSURL *)workingDirectoryURL;
+- (NSString *)projectName;
 - (NSString *)gitIgnoreFilename;
 - (BOOL)isBareRepository;
 

diff --git a/Classes/git/PBGitRepository.m b/Classes/git/PBGitRepository.m
@@ -555,18 +555,13 @@ - (void) readCurrentBranch
 		self.currentBranch = [self addBranch: [self headRef]];
 }
 
-- (NSString *) workingDirectory
+- (NSURL *)workingDirectoryURL {
+    return self.gtRepo.fileURL;
+}
+
+- (NSString *)workingDirectory
 {
-	const char* workdir = git_repository_workdir(self.gtRepo.git_repository);
-	if (workdir)
-	{
-		NSString* result = [[NSString stringWithUTF8String:workdir] stringByStandardizingPath];
-		return result;
-	}
-    else
-	{
-        return self.fileURL.path;
-	}
+    return [self.workingDirectoryURL path];
 }
 
 #pragma mark Remotes