Merge branch 'master' into add-screenshot

Author: jspiro

.clang-format

@@ -0,0 +1,94 @@
+---
+# Custom options in the special build of clang-format (these are not standard options)
+# IndentNestedBlocks: false
+# AllowNewlineBeforeBlockParameter: false
+
+# BasedOnStyle:  Google
+AccessModifierOffset: -1
+ConstructorInitializerIndentWidth: 4
+SortIncludes: false
+
+AlignAfterOpenBracket: true
+AlignEscapedNewlinesLeft: true
+AlignOperands: false
+AlignTrailingComments: true
+
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: true
+AllowShortIfStatementsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: All
+AllowShortLoopsOnASingleLine: true
+
+AlwaysBreakAfterDefinitionReturnType: false
+AlwaysBreakTemplateDeclarations: false
+AlwaysBreakBeforeMultilineStrings: false
+
+BreakBeforeBinaryOperators: None
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializersBeforeComma: false
+
+BinPackArguments: true
+BinPackParameters: true
+ColumnLimit: 0
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+DerivePointerAlignment: false
+ExperimentalAutoDetectBinPacking: false
+IndentCaseLabels: true
+IndentWrappedFunctionNames: false
+IndentFunctionDeclarationAfterType: false
+MaxEmptyLinesToKeep: 2
+KeepEmptyLinesAtTheStartOfBlocks: false
+NamespaceIndentation: Inner
+ObjCBlockIndentWidth: 4
+ObjCSpaceAfterProperty: true
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 10000
+PenaltyBreakComment: 300
+PenaltyBreakString: 1000
+PenaltyBreakFirstLessLess: 120
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerAlignment: Right
+SpacesBeforeTrailingComments: 1
+Cpp11BracedListStyle: true
+Standard:        Auto
+IndentWidth:     4
+TabWidth:        4
+UseTab:          Always
+BreakBeforeBraces: Custom
+BraceWrapping: 
+    AfterClass: true
+    AfterControlStatement: false
+    AfterEnum: false
+    AfterFunction: true
+    AfterNamespace: false
+    AfterObjCDeclaration: false
+    AfterStruct: false
+    AfterUnion: false
+    BeforeCatch: false
+    BeforeElse: false
+    IndentBraces: false
+
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+SpacesInAngles:  false
+SpaceInEmptyParentheses: false
+SpacesInCStyleCastParentheses: false
+SpaceAfterCStyleCast: false
+SpacesInContainerLiterals: true
+SpaceBeforeAssignmentOperators: true
+
+ContinuationIndentWidth: 4
+CommentPragmas:  '^ IWYU pragma:'
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+SpaceBeforeParens: ControlStatements
+DisableFormat:   false
+
+---
+Language: ObjC
+---
+Language: Cpp
+...
+

.gitmodules

@@ -9,7 +9,7 @@
 	url = https://github.com/alexgorbatchev/SyntaxHighlighter.git
 [submodule "MGScopeBar"]
 	path = External/MGScopeBar
-	url = https://github.com/rowanj/MGScopeBar.git
+	url = https://github.com/gitx/MGScopeBar.git
 [submodule "External/MAKVONotificationCenter"]
 	path = External/MAKVONotificationCenter
 	url = https://github.com/mikeash/MAKVONotificationCenter

.travis.yml

@@ -3,4 +3,4 @@ osx_image: xcode8.3
 before_install:
  - External/objective-git/script/bootstrap
 script:
- - xcodebuild -workspace GitX.xcworkspace -scheme GitX build | xcpretty
+ - set -o pipefail && xcodebuild -workspace GitX.xcworkspace -scheme GitX build | xcpretty

Classes/Controllers/ApplicationController.h

@@ -11,8 +11,7 @@
 
 @class PBCloneRepositoryPanel;
 
-@interface ApplicationController : NSObject<NSApplicationDelegate>
-{
+@interface ApplicationController : NSObject <NSApplicationDelegate> {
 	IBOutlet NSWindow *window;
 	IBOutlet id firstResponder;
 

Classes/Controllers/ApplicationController.m

@@ -22,33 +22,33 @@
 #import <Sparkle/SUUpdater.h>
 #import <Sparkle/SUUpdaterDelegate.h>
 
-static OpenRecentController* recentsDialog = nil;
+static OpenRecentController *recentsDialog = nil;
 
 @interface ApplicationController () <SUUpdaterDelegate>
 @end
 
 @implementation ApplicationController
 
-- (ApplicationController*)init
+- (ApplicationController *)init
 {
 #ifdef DEBUG_BUILD
 	[NSApp activateIgnoringOtherApps:YES];
 #endif
 
-	if(!(self = [super init]))
+	if (!(self = [super init]))
 		return nil;
 
-	if(![[NSBundle bundleWithPath:@"/System/Library/Frameworks/Quartz.framework/Frameworks/QuickLookUI.framework"] load])
-		if(![[NSBundle bundleWithPath:@"/System/Library/PrivateFrameworks/QuickLookUI.framework"] load])
+	if (![[NSBundle bundleWithPath:@"/System/Library/Frameworks/Quartz.framework/Frameworks/QuickLookUI.framework"] load])
+		if (![[NSBundle bundleWithPath:@"/System/Library/PrivateFrameworks/QuickLookUI.framework"] load])
 			NSLog(@"Could not load QuickLook");
 
 	/* Value Transformers */
 	NSValueTransformer *transformer = [[PBNSURLPathUserDefaultsTransfomer alloc] init];
 	[NSValueTransformer setValueTransformer:transformer forName:@"PBNSURLPathUserDefaultsTransfomer"];
-	
+
 	// Make sure the PBGitDefaults is initialized, by calling a random method
 	[PBGitDefaults class];
-	
+
 	started = NO;
 	return self;
 }
@@ -64,27 +64,27 @@ - (void)registerServices
 
 	// Force update the services menu if we have a new services version
 	NSInteger serviceVersion = [[NSUserDefaults standardUserDefaults] integerForKey:@"Services Version"];
-	if (serviceVersion < 2)
-	{
+	if (serviceVersion < 2) {
 		NSLog(@"Updating services menu…");
 		NSUpdateDynamicServices();
 		[[NSUserDefaults standardUserDefaults] setInteger:2 forKey:@"Services Version"];
 	}
 }
 
-- (void)application:(NSApplication *)sender openFiles:(NSArray <NSString *> *)filenames {
-	PBRepositoryDocumentController * controller = [PBRepositoryDocumentController sharedDocumentController];
-	
-	for (NSString * filename in filenames) {
-		NSURL * repository = [NSURL fileURLWithPath:filename];
-		[controller openDocumentWithContentsOfURL:repository display:YES
-								completionHandler:^void (NSDocument *document, BOOL documentWasAlreadyOpen, NSError *error) {
+- (void)application:(NSApplication *)sender openFiles:(NSArray<NSString *> *)filenames
+{
+	PBRepositoryDocumentController *controller = [PBRepositoryDocumentController sharedDocumentController];
+
+	for (NSString *filename in filenames) {
+		NSURL *repository = [NSURL fileURLWithPath:filename];
+		[controller openDocumentWithContentsOfURL:repository
+										  display:YES
+								completionHandler:^void(NSDocument *document, BOOL documentWasAlreadyOpen, NSError *error) {
 									if (!document) {
 										NSLog(@"Error opening repository \"%@\": %@", repository.path, error);
 										[controller presentError:error];
 										[sender replyToOpenOrPrint:NSApplicationDelegateReplyFailure];
-									}
-									else {
+									} else {
 										[sender replyToOpenOrPrint:NSApplicationDelegateReplySuccess];
 									}
 								}];
@@ -93,60 +93,60 @@ - (void)application:(NSApplication *)sender openFiles:(NSArray <NSString *> *)fi
 
 - (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender
 {
-	if(!started || [[[NSDocumentController sharedDocumentController] documents] count])
+	if (!started || [[[NSDocumentController sharedDocumentController] documents] count])
 		return NO;
 	return YES;
 }
 
 - (BOOL)applicationOpenUntitledFile:(NSApplication *)theApplication
 {
 	recentsDialog = [[OpenRecentController alloc] init];
-	if ([recentsDialog.possibleResults count] > 0)
-	{
+	if ([recentsDialog.possibleResults count] > 0) {
 		[recentsDialog show];
 		return YES;
-	}
-	else
-	{
+	} else {
 		return NO;
 	}
 }
 
-- (void)applicationDidFinishLaunching:(NSNotification*)notification
+- (void)applicationDidFinishLaunching:(NSNotification *)notification
 {
 	[[SUUpdater sharedUpdater] setSendsSystemProfile:YES];
-    [[SUUpdater sharedUpdater] setDelegate:self];
+	[[SUUpdater sharedUpdater] setDelegate:self];
 
 	// Make sure Git's SSH password requests get forwarded to our little UI tool:
-	setenv( "SSH_ASKPASS", [[[NSBundle mainBundle] pathForResource: @"gitx_askpasswd" ofType: @""] UTF8String], 1 );
-	setenv( "DISPLAY", "localhost:0", 1 );
+	setenv("SSH_ASKPASS", [[[NSBundle mainBundle] pathForResource:@"gitx_askpasswd" ofType:@""] UTF8String], 1);
+	setenv("DISPLAY", "localhost:0", 1);
 
 	[NSApp registerObserverForAppearanceChanges:self];
 	[self registerServices];
 	started = YES;
 }
 
-- (void) windowWillClose: sender
+- (void)windowWillClose:sender
 {
-	[firstResponder terminate: sender];
+	[firstResponder terminate:sender];
 }
 
 //Override the default behavior
-- (IBAction)openDocument:(id)sender {
-	NSOpenPanel* panel = [[NSOpenPanel alloc] init];
-	
+- (IBAction)openDocument:(id)sender
+{
+	NSOpenPanel *panel = [[NSOpenPanel alloc] init];
+
 	[panel setCanChooseFiles:false];
 	[panel setCanChooseDirectories:true];
-	
+
 	[panel beginWithCompletionHandler:^(NSInteger result) {
 		if (result == NSFileHandlingPanelOKButton) {
-			PBRepositoryDocumentController* controller = [PBRepositoryDocumentController sharedDocumentController];
-			[controller openDocumentWithContentsOfURL:panel.URL display:true completionHandler:^(NSDocument * _Nullable document, BOOL documentWasAlreadyOpen, NSError * _Nullable error) {
-				if (!document) {
-					NSLog(@"Error opening repository \"%@\": %@", panel.URL.path, error);
-					[controller presentError:error];
-				}
-			}];
+			PBRepositoryDocumentController *controller = [PBRepositoryDocumentController sharedDocumentController];
+			[controller openDocumentWithContentsOfURL:panel.URL
+											  display:true
+									completionHandler:^(NSDocument *_Nullable document, BOOL documentWasAlreadyOpen, NSError *_Nullable error) {
+										if (!document) {
+											NSLog(@"Error opening repository \"%@\": %@", panel.URL.path, error);
+											[controller presentError:error];
+										}
+									}];
 		}
 	}];
 }
@@ -163,16 +163,16 @@ - (IBAction)showAboutPanel:(id)sender
 	if (gitversion)
 		[dict addEntriesFromDictionary:[[NSDictionary alloc] initWithObjectsAndKeys:gitversion, @"Version", nil]];
 
-	#ifdef DEBUG_BUILD
-		[dict addEntriesFromDictionary:[[NSDictionary alloc] initWithObjectsAndKeys:@"GitX-dev (DEBUG)", @"ApplicationName", nil]];
-	#endif
+#ifdef DEBUG_BUILD
+	[dict addEntriesFromDictionary:[[NSDictionary alloc] initWithObjectsAndKeys:@"GitX-dev (DEBUG)", @"ApplicationName", nil]];
+#endif
 
 	[dict addEntriesFromDictionary:[[NSDictionary alloc] initWithObjectsAndKeys:@"GitX-dev (rowanj fork)", @"ApplicationName", nil]];
 
 	[NSApp orderFrontStandardAboutPanelWithOptions:dict];
 }
 
-- (IBAction) showCloneRepository:(id)sender
+- (IBAction)showCloneRepository:(id)sender
 {
 	if (!cloneRepositoryPanel)
 		cloneRepositoryPanel = [PBCloneRepositoryPanel panel];
@@ -182,19 +182,19 @@ - (IBAction) showCloneRepository:(id)sender
 
 - (IBAction)installCliTool:(id)sender;
 {
-	BOOL success               = NO;
-	NSString* installationPath = @"/usr/local/bin/";
-	NSString* installationName = @"gitx";
-	NSString* toolPath         = [[NSBundle mainBundle] pathForResource:@"gitx" ofType:@""];
+	BOOL success = NO;
+	NSString *installationPath = @"/usr/local/bin/";
+	NSString *installationName = @"gitx";
+	NSString *toolPath = [[NSBundle mainBundle] pathForResource:@"gitx" ofType:@""];
 	if (toolPath) {
 		AuthorizationRef auth;
 		if (AuthorizationCreate(NULL, kAuthorizationEmptyEnvironment, kAuthorizationFlagDefaults, &auth) == errAuthorizationSuccess) {
-			char const* mkdir_arg[] = { "-p", [installationPath UTF8String], NULL};
-			char const* mkdir	= "/bin/mkdir";
-			AuthorizationExecuteWithPrivileges(auth, mkdir, kAuthorizationFlagDefaults, (char**)mkdir_arg, NULL);
-			char const* arguments[] = { "-f", "-s", [toolPath UTF8String], [[installationPath stringByAppendingString: installationName] UTF8String],  NULL };
-			char const* helperTool  = "/bin/ln";
-			if (AuthorizationExecuteWithPrivileges(auth, helperTool, kAuthorizationFlagDefaults, (char**)arguments, NULL) == errAuthorizationSuccess) {
+			char const *mkdir_arg[] = {"-p", [installationPath UTF8String], NULL};
+			char const *mkdir = "/bin/mkdir";
+			AuthorizationExecuteWithPrivileges(auth, mkdir, kAuthorizationFlagDefaults, (char **)mkdir_arg, NULL);
+			char const *arguments[] = {"-f", "-s", [toolPath UTF8String], [[installationPath stringByAppendingString:installationName] UTF8String], NULL};
+			char const *helperTool = "/bin/ln";
+			if (AuthorizationExecuteWithPrivileges(auth, helperTool, kAuthorizationFlagDefaults, (char **)arguments, NULL) == errAuthorizationSuccess) {
 				int status;
 				int pid = wait(&status);
 				if (pid != -1 && WIFEXITED(status) && WEXITSTATUS(status) == 0)
@@ -207,7 +207,7 @@ - (IBAction)installCliTool:(id)sender;
 		}
 	}
 
-	NSAlert * alert = [[NSAlert alloc] init];
+	NSAlert *alert = [[NSAlert alloc] init];
 	if (success) {
 		alert.messageText = NSLocalizedString(@"Installation Complete", @"Headline for successfully completed installation of the command line tool");
 		alert.informativeText = [NSString stringWithFormat:NSLocalizedString(@"The gitx tool has been installed to %@.", @"Informative text for successfully completed installation of the command line tool at the location %@"), installationPath];
@@ -225,20 +225,20 @@ - (NSArray *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:
 	NSArray *keys = [NSArray arrayWithObjects:@"key", @"displayKey", @"value", @"displayValue", nil];
 	NSMutableArray *feedParameters = [NSMutableArray array];
 
-    // only add parameters if the profile is being sent this time
-    if (sendingProfile) {
-        NSString *CFBundleGitVersion = [[[NSBundle mainBundle] infoDictionary] valueForKey:@"CFBundleGitVersion"];
+	// only add parameters if the profile is being sent this time
+	if (sendingProfile) {
+		NSString *CFBundleGitVersion = [[[NSBundle mainBundle] infoDictionary] valueForKey:@"CFBundleGitVersion"];
 		if (CFBundleGitVersion)
-			[feedParameters addObject:[NSDictionary dictionaryWithObjects:[NSArray arrayWithObjects:@"CFBundleGitVersion", @"Full Version", CFBundleGitVersion, CFBundleGitVersion, nil] 
+			[feedParameters addObject:[NSDictionary dictionaryWithObjects:[NSArray arrayWithObjects:@"CFBundleGitVersion", @"Full Version", CFBundleGitVersion, CFBundleGitVersion, nil]
 																  forKeys:keys]];
 
-        NSString *gitVersion = [PBGitBinary version];
+		NSString *gitVersion = [PBGitBinary version];
 		if (gitVersion)
-			[feedParameters addObject:[NSDictionary dictionaryWithObjects:[NSArray arrayWithObjects:@"gitVersion", @"git Version", gitVersion, gitVersion, nil] 
+			[feedParameters addObject:[NSDictionary dictionaryWithObjects:[NSArray arrayWithObjects:@"gitVersion", @"git Version", gitVersion, gitVersion, nil]
 																  forKeys:keys]];
 	}
 
-    return feedParameters;
+	return feedParameters;
 }
 
 
@@ -251,7 +251,7 @@ - (IBAction)showHelp:(id)sender
 
 - (IBAction)reportAProblem:(id)sender
 {
-    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://github.com/gitx/gitx/issues"]];
+	[[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://github.com/gitx/gitx/issues"]];
 }
 
 - (IBAction)showChangeLog:(id)sender
@@ -260,5 +260,4 @@ - (IBAction)showChangeLog:(id)sender
 }
 
 
-
 @end