Merge remote branch 'refs/remotes/dgrijalva/stable' into experimental

Conflicts:
	ApplicationController.m
	GitX.xcodeproj/project.pbxproj
	PBGitCommitView.xib
	PBGitHistoryView.xib
	PBGitRevisionCell.m
	PBGitTree.m
	PBGitWindowController.m
	PBViewController.m
	html/views/history/history.js
	html/views/history/index.html

Author: brotherbard

ApplicationController.m

@@ -17,6 +17,7 @@
 #import "PBNSURLPathUserDefaultsTransfomer.h"
 #import "PBGitDefaults.h"
 #import "PBCloneRepositoryPanel.h"
+#import "Sparkle/SUUpdater.h"
 
 @implementation ApplicationController
 @synthesize cliProxy;
@@ -65,6 +66,7 @@ - (void)registerServices
 
 - (void)applicationDidFinishLaunching:(NSNotification*)notification
 {
+	[[SUUpdater sharedUpdater] setSendsSystemProfile:YES];
 	[self registerServices];
 
     BOOL hasOpenedDocuments = NO;

DBPrefsWindowController.m

@@ -74,13 +74,13 @@ - (void)windowDidLoad
 		// Create a new window to display the preference views.
 		// If the developer attached a window to this controller
 		// in Interface Builder, it gets replaced with this one.
-	NSWindow *window = [[[NSWindow alloc] initWithContentRect:NSMakeRect(0,0,1000,1000)
+	NSPanel *panel = [[[NSPanel alloc] initWithContentRect:NSMakeRect(0,0,1000,1000)
 												    styleMask:(NSTitledWindowMask |
 															   NSClosableWindowMask |
 															   NSMiniaturizableWindowMask)
 													  backing:NSBackingStoreBuffered
 													    defer:YES] autorelease];
-	[self setWindow:window];
+	[self setWindow:panel];
 	contentSubview = [[[NSView alloc] initWithFrame:[[[self window] contentView] frame]] autorelease];
 	[contentSubview setAutoresizingMask:(NSViewMinYMargin | NSViewWidthSizable)];
 	[[[self window] contentView] addSubview:contentSubview];

Documentation/ReleaseNotes/v0.7.1.txt

@@ -0,0 +1,12 @@
+v0.7.1
+===
+
+This is a maintenance release. The following bugs have been fixed:
+
+* The Tree View now tries to be smart about displaying binaries (Johannes)
+* GitX now correctly tries to require git v1.6.0 or higher (Pieter)
+* Amending commits if the author name has UTF-8 multi-byte characters now correctly works (Pieter)
+* GitX no longer stalls for large periods when refreshing in the commit view (Johannes, Pieter)
+* The history view tries to be less crashy when loading commits
+
+In addition, the Sparkle framework has been updated so that future updates will be signed

GitX.xcodeproj/project.pbxproj

@@ -408,6 +408,7 @@
 		F5E92A220E88569500056E75 /* new_file.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = new_file.png; path = Images/new_file.png; sourceTree = "<group>"; };
 		F5EF8C8C0E9D4A5D0050906B /* PBWebController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBWebController.h; sourceTree = "<group>"; };
 		F5EF8C8D0E9D4A5D0050906B /* PBWebController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBWebController.m; sourceTree = "<group>"; };
+		F5F7D0641062E7940072C81C /* UpdateKey.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = UpdateKey.pem; sourceTree = "<group>"; };
 		F5FC41F20EBCBD4300191D80 /* PBGitXProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitXProtocol.h; sourceTree = "<group>"; };
 		F5FC41F30EBCBD4300191D80 /* PBGitXProtocol.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitXProtocol.m; sourceTree = "<group>"; };
 		F5FC43C30EBD050800191D80 /* PBRefContextDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBRefContextDelegate.h; sourceTree = "<group>"; };
@@ -557,6 +558,7 @@
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				F5F7D0641062E7940072C81C /* UpdateKey.pem */,
 				F50A41130EBB872D00208746 /* Widgets */,
 				47DBDB920E94F47200671A1E /* Preference Icons */,
 				D26DC6440E782C9000C777B2 /* gitx.icns */,
@@ -960,7 +962,6 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = F5886A150ED5D33E0066E74C /* Build configuration list for PBXNativeTarget "SpeedTest" */;
 			buildPhases = (
-				F5886A0C0ED5D33D0066E74C /* Resources */,
 				F5886A0D0ED5D33D0066E74C /* Sources */,
 				F5886A0E0ED5D33D0066E74C /* Frameworks */,
 			);
@@ -1050,13 +1051,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		F5886A0C0ED5D33D0066E74C /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */

Info.plist

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>SUPublicDSAKeyFile</key>
+	<string>UpdateKey.pem</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleName</key>
@@ -49,7 +51,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>LONG_VERSION</string>
+	<string>SHORT_VERSION</string>
 	<key>CFBundleGitVersion</key>
 	<string>GIT_VERSION</string>
 	<key>CFBundleShortVersionString</key>

PBGitHistoryController.m

@@ -349,6 +349,13 @@ - (void) updateView
 	[self updateKeys];
 }
 
+- (void)viewLoaded
+{
+	float position = [[NSUserDefaults standardUserDefaults] floatForKey:@"PBGitSplitViewPosition"];
+	if (position)
+		[historySplitView setPosition:position ofDividerAtIndex:0];
+}
+
 - (NSResponder *)firstResponder;
 {
 	return commitList;
@@ -403,6 +410,9 @@ - (BOOL) hasNonlinearPath
 
 - (void) removeView
 {
+	float position = [[[historySplitView subviews] objectAtIndex:0] frame].size.height;
+	[[NSUserDefaults standardUserDefaults] setFloat:position forKey:@"PBGitSplitViewPosition"];
+	[[NSUserDefaults standardUserDefaults] synchronize];
 	[webView close];
 	[commitController removeObserver:self forKeyPath:@"selection"];
 	[treeController removeObserver:self forKeyPath:@"selection"];

PBGitTree.m

@@ -216,9 +216,6 @@ - (NSArray*) children
 
 	NSString* p = [handle readLine];
 	while (p.length > 0) {
-		if ([p isEqualToString:@"\r"])
-			break;
-
 		BOOL isLeaf = ([p characterAtIndex:p.length - 1] != '/');
 		if (!isLeaf)
 			p = [p substringToIndex:p.length -1];

PBViewController.h

@@ -23,8 +23,20 @@
 @property(assign) BOOL isBusy;
 
 - (id)initWithRepository:(PBGitRepository *)theRepository superController:(PBGitWindowController *)controller;
+
+/* removeView is called whenever the view is removed, either to be swapped
+ * with a different view, or when the repository window will be destroyed
+ */
 - (void) removeView;
+
+/* Updateview is called every time it is loaded into the main view */
 - (void) updateView;
+
+/* Called after awakeFromNib:, and the view has been loaded into the main view.
+ * Useful for resizing stuff after everything has been set in the right position
+ */
+- (void)viewLoaded;
+
 - (NSResponder *)firstResponder;
 - (IBAction) refresh:(id)sender;
 

PBViewController.m

@@ -37,18 +37,22 @@ - (void) awakeFromNib
 {
 }
 
-// This is called when the view is displayed again; it 
-// should be updated to show the most recent information
-- (void) updateView
+- (NSResponder *)firstResponder;
 {
+	return nil;
 }
 
 - (IBAction) refresh: sender
 {
 }
 
-- (NSResponder *)firstResponder;
+// The next methods should be implemented in the subclass if necessary
+- (void)updateView
 {
-	return nil;
 }
+
+- (void)viewLoaded
+{
+}
+
 @end

Sparkle.framework/Versions/A/Headers/SUAppcastItem.h

@@ -12,7 +12,7 @@
 @interface SUAppcastItem : NSObject {
 	NSString *title;
 	NSDate *date;
-	NSString *description;
+	NSString *itemDescription;
 
 	NSURL *releaseNotesURL;
 
@@ -33,7 +33,7 @@
 - (NSString *)versionString;
 - (NSString *)displayVersionString;
 - (NSDate *)date;
-- (NSString *)description;
+- (NSString *)itemDescription;
 - (NSURL *)releaseNotesURL;
 - (NSURL *)fileURL;
 - (NSString *)DSASignature;