Merged fork master with pieter/master

Author: rastersize

ApplicationController.h

@@ -28,6 +28,7 @@
 - (NSManagedObjectContext *)managedObjectContext;
 
 - (IBAction)openPreferencesWindow:(id)sender;
+- (IBAction)showAboutPanel:(id)sender;
 
 - (IBAction)installCliTool:(id)sender;
 

ApplicationController.m

@@ -68,18 +68,30 @@ - (void)applicationDidFinishLaunching:(NSNotification*)notification
 	// Only try to open a default document if there are no documents open already.
 	// For example, the application might have been launched by double-clicking a .git repository,
 	// or by dragging a folder to the app icon
-	if ([[[PBRepositoryDocumentController sharedDocumentController] documents] count] == 0 && [[NSApplication sharedApplication] isActive]) {
-		// Try to open the current directory as a git repository
-		NSURL *url = nil;
-		if([[[NSProcessInfo processInfo] environment] objectForKey:@"PWD"])
-			url = [NSURL fileURLWithPath:[[[NSProcessInfo processInfo] environment] objectForKey:@"PWD"]];
-		NSError *error = nil;
-		if (!url || [[PBRepositoryDocumentController sharedDocumentController] openDocumentWithContentsOfURL:url display:YES error:&error] == NO) {
-			// The current directory could not be opened (most likely it’s not a git repository)
-			// so show an open panel for the user to select a repository to view
-			[[PBRepositoryDocumentController sharedDocumentController] openDocument:self];
-		}
+	if ([[[PBRepositoryDocumentController sharedDocumentController] documents] count])
+		return;
+
+	if (![[NSApplication sharedApplication] isActive])
+		return;
+
+	NSURL *url = nil;
+
+	// Try to find the current directory, to open that as a repository
+	if ([PBGitDefaults openCurDirOnLaunch]) {
+		NSString *curPath = [[[NSProcessInfo processInfo] environment] objectForKey:@"PWD"];
+		if (curPath)
+			url = [NSURL fileURLWithPath:curPath];
 	}
+
+	// Try to open the found URL
+	NSError *error = nil;
+	if (url && [[PBRepositoryDocumentController sharedDocumentController] openDocumentWithContentsOfURL:url display:YES error:&error])
+		return;
+
+	// The current directory was not enabled or could not be opened (most likely it’s not a git repository).
+	// show an open panel for the user to select a repository to view
+	if ([PBGitDefaults showOpenPanelOnLaunch])
+		[[PBRepositoryDocumentController sharedDocumentController] openDocument:self];
 }
 
 - (void) windowWillClose: sender
@@ -92,6 +104,20 @@ - (IBAction)openPreferencesWindow:(id)sender
 	[[PBPrefsWindowController sharedPrefsWindowController] showWindow:nil];
 }
 
+- (IBAction)showAboutPanel:(id)sender
+{
+	NSString *gitversion = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleGitVersion"];
+	NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
+	if (gitversion)
+		[dict addEntriesFromDictionary:[[NSDictionary alloc] initWithObjectsAndKeys:gitversion, @"Version", nil]];
+
+	#ifdef DEBUG_BUILD
+		[dict addEntriesFromDictionary:[[NSDictionary alloc] initWithObjectsAndKeys:@"GitX (DEBUG)", @"ApplicationName", nil]];
+	#endif
+
+	[NSApp orderFrontStandardAboutPanelWithOptions:dict];
+}
+
 - (IBAction)installCliTool:(id)sender;
 {
 	BOOL success               = NO;

Documentation/ReleaseNotes/v0.6.2.txt

@@ -15,4 +15,5 @@ In addition, the following features have been added:
 * There is now a 'New…' option to create a new repository
 * The 'Gist It' feature now asks for confirmation by default. This can be changed in the preferences
 * GitX can now open any directory by dragging it on the icon
-* GitX now asks for confirmation before deleting a branch
+* GitX now asks for confirmation before deleting a branch
+

Documentation/ReleaseNotes/v0.6.3.txt

@@ -5,4 +5,5 @@ This is a maintenance release. The following bugs have been fixed:
 
 * Fixed a problem where GitX could not open some directories, for example those that include a . [Johannes Gilger]
 * Fixed a performance issue when staging or unstaging a lot of files
-* Various buildfixes (Benjamin Kramer, Arjen Laarhoven)
+* Various buildfixes (Benjamin Kramer, Arjen Laarhoven)
+

Documentation/ReleaseNotes/v0.7.txt

@@ -0,0 +1,35 @@
+v0.7
+===
+
+As a GitX user, we would like you to help us focus our development by telling
+us your wishes. You can help us by filling in this
+ [survey](http://www.survs.com/survey?id=DCJKLP2B&channel=UY6RRC3MXZ "GitX User survey")!
+
+This feature-release has the following new features and enhancements:
+
+* Line-wise staging by selecting lines from hunks (JD Smith)
+* Discarding hunks/changes to files (using git apply --reverse) (Johannes Gilger)
+* Show current HEAD in window-title (Johannes Gilger)
+* Show current branch in orange in history view (Steven Michalske)
+* Collapse commit-list/diff-view using Command-Shift-Up/Down (Johannes Gilger)
+* Sign-Off commits in commit view (Johannes Gilger, Nicolas Riley)
+* "Show in Finder" for files in commit view (Charles O'Rourke)
+* Commit hooks are executed when committing (Joe Fiorini, Pieter de Bie)
+* Branches can be deleted from the UI
+
+Small enhancements:
+
+* Option to disable the "Open" dialog on start (Stonewall Ballard)
+* Show committer name if it differs from authors name (Benjamin Kramer)
+* Columns in history view can be toggled (Pieter de Bie)
+* Reuse author-information when amending a commit (Pieter de Bie)
+* Commit interface is now faster (Pieter de Bie)
+* Use modal alerts where possible
+* Don't display content of binary-files in tree-view
+* The user manual has been updated for 0.7 (Johannes Gilger)
+* Make the Commit UI a bit more informative (Nicholas Riley)
+
+
+In addition a lot of bugs were fixed and numerous tiny features introduced.
+
+Credits go to: Pieter de Bie, Johannes Gilger, Benjamin Kramer, Nicholas Riley, JD Smith, Joe Fiorini, Dave Grijalva, Charles O'Rourke, Gerd Knops, dbr, Mike Czepiel, Benoit Cerrina, Steven Michalske and Stonewall Ballard

English.lproj/MainMenu.xib

@@ -886,8 +886,8 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">orderFrontStandardAboutPanel:</string>
-						<reference key="source" ref="519751875"/>
+						<string key="label">showAboutPanel:</string>
+						<reference key="source" ref="859235683"/>
 						<reference key="destination" ref="1039244063"/>
 					</object>
 					<int key="connectionID">142</int>
@@ -2278,6 +2278,7 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>installCliTool:</string>
 							<string>openPreferencesWindow:</string>
+							<string>showAboutPanel:</string>
 							<string>saveAction:</string>
 							<string>showHelp:</string>
 						</object>
@@ -2287,6 +2288,7 @@
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">