Merge remote branch 'ahgutsche/master'

Author: Byron

git/cmd.py

@@ -87,6 +87,7 @@ def wait(self):
 			"""Wait for the process and return its status code. 
 			
 			:raise GitCommandError: if the return status is not 0"""
+			sleep_on_gui_present_osx_crashfix()
 			status = self.proc.wait()
 			if status != 0:
 				raise GitCommandError(self.args, status, self.proc.stderr.read())

git/diff.py

@@ -10,6 +10,8 @@
 from exc import GitCommandError
 
 from gitdb.util import hex_to_bin
+
+from util import sleep_on_gui_present_osx_crashfix
 
 __all__ = ('Diffable', 'DiffIndex', 'Diff')
 
@@ -99,6 +101,7 @@ def diff(self, other=Index, paths=None, create_patch=False, **kwargs):
 			diff_method = Diff._index_from_patch_format
 		index = diff_method(self.repo, proc.stdout)
 
+		sleep_on_gui_present_osx_crashfix()
 		status = proc.wait()
 		return index
 

git/util.py

@@ -21,7 +21,7 @@
 						)
 
 __all__ = ( "stream_copy", "join_path", "to_native_path_windows", "to_native_path_linux", 
-			"join_path_native", "Stats", "IndexFileSHA1Writer", "Iterable", "IterableList", 
+			"join_path_native", "sleep_on_gui_present_osx_crashfix", "Stats", "IndexFileSHA1Writer", "Iterable", "IterableList", 
 			"BlockingLockFile", "LockFile", 'Actor', 'get_user_id', 'assure_directory_exists',
 			'RemoteProgress')
 
@@ -101,6 +101,14 @@ def get_user_id():
 	# END get username from login
 	return "%s@%s" % (username, platform.node())
 
+def sleep_on_gui_present_osx_crashfix():
+	"""This fixes a crash which appears when using pyside on OS X."""
+	
+	#HACK: These two lines are necessary because OSX raises an error if you try to .wait() right after creating the process object.
+	# It is only necessary when using GUI frameworks to instantiate an application.
+	if platform.system().startswith("Darwin") and "PySide" in sys.modules.keys():
+		time.sleep(0.1)
+
 #} END utilities
 
 #{ Classes