Merge remote-tracking branch 'tiennou/master'

Author: ssp

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "objective-git"]
 	path = objective-git
-	url = git://github.com/rowanj/objective-git.git
+	url = git://github.com/libgit2/objective-git.git
 [submodule "Sparkle"]
 	path = Sparkle
 	url = git://github.com/sparkle-project/Sparkle.git

.travis.yml

@@ -0,0 +1,6 @@
+language: objective-c
+xcode_project: GitX.xcodeproj
+xcode_scheme: Release
+osx_image: xcode7.1
+before_install:
+ - objective-git/script/bootstrap

Classes/Controllers/ApplicationController.m

@@ -7,6 +7,7 @@
 //
 
 #import "ApplicationController.h"
+#import "PBRepositoryDocumentController.h"
 #import "PBGitRevisionCell.h"
 #import "PBGitWindowController.h"
 #import "PBServicesController.h"
@@ -22,6 +23,9 @@
 
 static OpenRecentController* recentsDialog = nil;
 
+@interface ApplicationController () <SUUpdaterDelegate>
+@end
+
 @implementation ApplicationController
 
 - (ApplicationController*)init
@@ -67,6 +71,20 @@ - (void)registerServices
 	}
 }
 
+- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename {
+    NSURL *repository = [NSURL fileURLWithPath:filename];
+    NSError *error = nil;
+    NSDocument *doc = [[PBRepositoryDocumentController sharedDocumentController] openDocumentWithContentsOfURL:repository
+                                                                                                       display:YES
+                                                                                                         error:&error];
+    if (!doc) {
+        NSLog(@"Error opening repository \"%@\": %@", repository.path, error);
+        return NO;
+    }
+
+    return YES;
+}
+
 - (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender
 {
 	if(!started || [[[NSDocumentController sharedDocumentController] documents] count])

Classes/Controllers/OpenRecentController.m

@@ -76,9 +76,9 @@ - (IBAction) tableDoubleClick:(id)sender
 {
 	[self changeSelection:self];
 	if(selectedResult != nil) {
-		[[NSDocumentController sharedDocumentController] openDocumentWithContentsOfURL:selectedResult
-                                                                               display:YES
-                                                                                 error:nil];
+		[[NSDocumentController sharedDocumentController] openDocumentWithContentsOfURL:selectedResult display:YES completionHandler:^(NSDocument * _Nullable document, BOOL documentWasAlreadyOpen, NSError * _Nullable error) {
+
+		}];
 	}
 	[self hide];
 }
@@ -87,9 +87,9 @@ - (BOOL)control:(NSControl*)control textView:(NSTextView*)textView doCommandBySe
     BOOL result = NO;
     if (commandSelector == @selector(insertNewline:)) {
 		if(selectedResult != nil) {
-			[[NSDocumentController sharedDocumentController] openDocumentWithContentsOfURL:selectedResult
-                                                                                   display:YES
-                                                                                     error:nil];
+			[[NSDocumentController sharedDocumentController] openDocumentWithContentsOfURL:selectedResult display:YES completionHandler:^(NSDocument * _Nullable document, BOOL documentWasAlreadyOpen, NSError * _Nullable error) {
+
+			}];
 		}
 		[self hide];
 //		[searchWindow makeKeyAndOrderFront: nil];

Classes/Controllers/PBDiffWindowController.h

@@ -10,12 +10,11 @@
 
 @class PBGitCommit;
 
-@interface PBDiffWindowController : NSWindowController {
-	NSString *diff;
-}
+@interface PBDiffWindowController : NSWindowController
 
-+ (void) showDiffWindowWithFiles:(NSArray *)filePaths fromCommit:(PBGitCommit *)startCommit diffCommit:(PBGitCommit *)diffCommit;
-- (id) initWithDiff:(NSString *)diff;
++ (void)showDiff:(NSString *)diff;
++ (void)showDiffWindowWithFiles:(NSArray *)filePaths fromCommit:(PBGitCommit *)startCommit diffCommit:(PBGitCommit *)diffCommit;
+- (instancetype)initWithDiff:(NSString *)diff;
 
 @property (readonly) NSString *diff;
 @end

Classes/Controllers/PBDiffWindowController.m

@@ -13,47 +13,29 @@
 
 
 @implementation PBDiffWindowController
-@synthesize diff;
 
-- (id) initWithDiff:(NSString *)aDiff
++ (void)showDiff:(NSString *)diff
 {
-    self = [super initWithWindowNibName:@"PBDiffWindow"];
-
-    if (self)
-        diff = aDiff;
-    
-	return self;
+	PBDiffWindowController *diffController = [[self alloc] initWithDiff:diff];
+	[diffController showWindow:self];
 }
 
-
-+ (void) showDiffWindowWithFiles:(NSArray *)filePaths fromCommit:(PBGitCommit *)startCommit diffCommit:(PBGitCommit *)diffCommit
++ (void)showDiffWindowWithFiles:(NSArray *)filePaths fromCommit:(PBGitCommit *)startCommit diffCommit:(PBGitCommit *)diffCommit
 {
-	if (!startCommit)
-		return;
-
-	if (!diffCommit)
-		diffCommit = [startCommit.repository headCommit];
-
-	NSString *commitSelector = [NSString stringWithFormat:@"%@..%@", startCommit.SHA, diffCommit.SHA];
-	NSMutableArray *arguments = [NSMutableArray arrayWithObjects:@"diff", @"--no-ext-diff", commitSelector, nil];
+	NSParameterAssert(startCommit != nil);
+	NSString *diff = [startCommit.repository performDiff:startCommit against:diffCommit forFiles:filePaths];
 
-	if (![PBGitDefaults showWhitespaceDifferences])
-		[arguments insertObject:@"-w" atIndex:1];
-
-	if (filePaths) {
-		[arguments addObject:@"--"];
-		[arguments addObjectsFromArray:filePaths];
-	}
+	[PBDiffWindowController showDiff:[diff copy]];
+}
 
-	int retValue;
-	NSString *diff = [startCommit.repository outputInWorkdirForArguments:arguments retValue:&retValue];
-	if (retValue) {
-		NSLog(@"diff failed with retValue: %d   for command: '%@'    output: '%@'", retValue, [arguments componentsJoinedByString:@" "], diff);
-		return;
-	}
+- (id)initWithDiff:(NSString *)aDiff
+{
+    self = [super initWithWindowNibName:@"PBDiffWindow"];
+    if (!self) return nil;
 
-	PBDiffWindowController *diffController = [[PBDiffWindowController alloc] initWithDiff:[diff copy]];
-	[diffController showWindow:nil];
+	_diff = aDiff;
+    
+	return self;
 }
 
 

Classes/Controllers/PBGitHistoryController.h

@@ -79,8 +79,6 @@
 - (NSMenu *)contextMenuForTreeView;
 - (NSArray *)menuItemsForPaths:(NSArray *)paths;
 - (void)showCommitsFromTree:(id)sender;
-- (void)showInFinderAction:(id)sender;
-- (void)openFilesAction:(id)sender;
 
 // Repository Methods
 - (IBAction) createBranch:(id)sender;

Classes/Controllers/PBGitHistoryController.m

@@ -594,6 +594,7 @@ - (void) checkoutFiles:(id)sender
 
 - (void) diffFilesAction:(id)sender
 {
+	/* TODO: Move that to the document */
 	[PBDiffWindowController showDiffWindowWithFiles:[sender representedObject] fromCommit:self.selectedCommits.firstObject diffCommit:nil];
 }
 
@@ -673,32 +674,6 @@ - (CGFloat)splitView:(NSSplitView *)splitView constrainMaxCoordinate:(CGFloat)pr
 	return [splitView frame].size.height - [splitView dividerThickness] - historySplitView.bottomViewMin;
 }
 
-// while the user resizes the window keep the upper (history) view constant and just resize the lower view
-// unless the lower view gets too small
-- (void)splitView:(NSSplitView *)splitView resizeSubviewsWithOldSize:(NSSize)oldSize
-{
-	NSRect newFrame = [splitView frame];
-
-	float dividerThickness = [splitView dividerThickness];
-
-	NSView *upperView = [[splitView subviews] objectAtIndex:0];
-	NSRect upperFrame = [upperView frame];
-	upperFrame.size.width = newFrame.size.width;
-
-	if ((newFrame.size.height - upperFrame.size.height - dividerThickness) < historySplitView.bottomViewMin) {
-		upperFrame.size.height = newFrame.size.height - historySplitView.bottomViewMin - dividerThickness;
-	}
-
-	NSView *lowerView = [[splitView subviews] objectAtIndex:1];
-	NSRect lowerFrame = [lowerView frame];
-	lowerFrame.origin.y = upperFrame.size.height + dividerThickness;
-	lowerFrame.size.height = newFrame.size.height - lowerFrame.origin.y;
-	lowerFrame.size.width = newFrame.size.width;
-
-	[upperView setFrame:upperFrame];
-	[lowerView setFrame:lowerFrame];
-}
-
 // NSSplitView does not save and restore the position of the SplitView correctly so do it manually
 - (void)saveSplitViewPosition
 {
@@ -841,8 +816,8 @@ - (NSRect)previewPanel:(id)panel sourceFrameOnScreenForPreviewItem:(id <QLPrevie
     }
 
     // convert icon rect to screen coordinates
-    iconRect = [fileBrowser convertRectToBase:iconRect];
-    iconRect.origin = [[fileBrowser window] convertBaseToScreen:iconRect.origin];
+	iconRect = [fileBrowser.window.contentView convertRect:iconRect fromView:fileBrowser];
+	iconRect = [fileBrowser.window convertRectToScreen:iconRect];
 
     return iconRect;
 }

Classes/Controllers/PBGitRepositoryDocument.h

@@ -0,0 +1,33 @@
+//
+//  PBGitRepositoryDocument.h
+//  GitX
+//
+//  Created by Etienne on 31/07/2014.
+//
+//
+
+#import <Cocoa/Cocoa.h>
+
+@class PBGitRepository;
+@class PBGitRevSpecifier;
+
+extern NSString *PBGitRepositoryDocumentType;
+
+@interface PBGitRepositoryDocument : NSDocument
+
+@property (nonatomic, strong, readonly) PBGitRepository *repository;
+
+
+// Scripting Bridge
+- (void)findInModeScriptCommand:(NSScriptCommand *)command;
+
+// Responder
+- (IBAction)showInFinderAction:(id)sender;
+- (IBAction)openFilesAction:(id)sender;
+
+- (IBAction)showCommitView:(id)sender;
+- (IBAction)showHistoryView:(id)sender;
+
+- (void)selectRevisionSpecifier:(PBGitRevSpecifier *)specifier;
+
+@end