From ce3d8ae34c6e74f970400952b2e1a984a5f96102 Mon Sep 17 00:00:00 2001
From: Pieter de Bie <frimmirf+gitx@gmail.com>
Date: Tue, 9 Jun 2009 22:28:59 +0100
Subject: [PATCH 01/18] Site: add link to Twitter

---
 Site/templates/site.html   | 2 +-
 Site/text/contact.markdown | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Site/templates/site.html b/Site/templates/site.html
index c1001b6..c308843 100644
--- a/Site/templates/site.html
+++ b/Site/templates/site.html
@@ -40,7 +40,7 @@ end
 				<%= @body %>
 			</div>
 			<div id="footer">
-				© Some rights reserved. <a href="http://github.com/pieter/gitx/tree/master/COPYING" title="GPL">GPL v2</a>. <a href="mailto:frimmirf+gitx@gmail.com">Pieter de Bie</a> is the GitX maintainer. Website design by <a href="http://www.ai.rug.nl/~kdoes/index.php?id=webdesign">Kim Does</a>.
+				© Some rights reserved. <a href="http://github.com/pieter/gitx/tree/master/COPYING" title="GPL">GPL v2</a>. <a href="mailto:frimmirf+gitx@gmail.com">Pieter de Bie</a> (<a href="http://twitter.com/pdebie">@pdebie</a>) is the GitX maintainer. Website design by <a href="http://www.ai.rug.nl/~kdoes/index.php?id=webdesign">Kim Does</a>.
 			</div>
 		</div>
 	<script type="text/javascript">
diff --git a/Site/text/contact.markdown b/Site/text/contact.markdown
index f078a3c..7dc4d92 100644
--- a/Site/text/contact.markdown
+++ b/Site/text/contact.markdown
@@ -4,4 +4,4 @@ Contact
 
 GitX is actively maintained on Github at [http://github.com/pieter/gitx](http://www.github.com/pieter/gitx/wikis). If you find any bugs or have feature requests, you can put them there.
 
-GitX is actively maintained by Pieter de Bie. You can email him at [frimmirf@gmail.com](mailto:frimmirf+gitx@gmail.com)
\ No newline at end of file
+GitX is actively maintained by Pieter de Bie. You can email him at [frimmirf@gmail.com](mailto:frimmirf+gitx@gmail.com) or on twitter <a href="http://twitter.com/pdebie">@pdebie</a>
\ No newline at end of file

From 60908fd14356f3a01d957d2a29c10a07460f0870 Mon Sep 17 00:00:00 2001
From: Johannes Gilger <heipei@hackvalue.de>
Date: Wed, 10 Jun 2009 17:13:35 +0200
Subject: [PATCH 02/18] keyboardNavigation: Fix keys 'c' and 'v' from webView

This fixes two small bugs:
1. The JavaScript-method is called "showDiff" instead of "showDiffs"
since cfbcfc1f38ac. That's why the 'v' button didn't work since then.
2. Commit f05d0188fce3b5e introduced an error when trying to access
"event" for key-presses from Cocoa, which resulted in an error and
therefore made the following if-statements unreachable.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
---
 html/lib/keyboardNavigation.js | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/html/lib/keyboardNavigation.js b/html/lib/keyboardNavigation.js
index 02b9754..28a57ac 100644
--- a/html/lib/keyboardNavigation.js
+++ b/html/lib/keyboardNavigation.js
@@ -17,10 +17,10 @@ var handleKeys = function(event) {
 		return changeFile(true);
 	else if (event.keyCode == 38 && event.ctrlKey == true) // ctrl-up_arrow
 		return changeFile(false);
-	else if (event.keyCode == 86) {// 'v'
-		showDiffs();
-		return false;
-	}
+	else if (event.keyCode == 86) // 'v'
+		showDiff();
+	else if (event.keyCode == 67) // 'c'
+		Controller.copySource();
 	return true;
 }
 
@@ -29,12 +29,8 @@ var handleKeyFromCocoa = function(key) {
 		changeHunk(true);
 	else if (key == 'k')
 		changeHunk(false);
-	else if (event.keyCode == 40 && event.ctrlKey == true) // ctrl-down_arrow
-		changeFile(true);
-	else if (event.keyCode == 38 && event.ctrlKey == true) // ctrl-up_arrow
-		changeFile(false);
 	else if (key == 'v')
-		showDiffs();
+		showDiff();
 	else if (key == 'c')
 		Controller.copySource();
 }

From 5f97caabd10f45f67121025fb804bd7c557494fa Mon Sep 17 00:00:00 2001
From: Pieter de Bie <frimmirf+gitx@gmail.com>
Date: Fri, 12 Jun 2009 00:15:00 +0100
Subject: [PATCH 03/18] HistoryView: only add parents if parents array exists

This used to break if a commit had no parents. This wasn't noticed
before because the breakage is only minor -- the only way you see it
is because the detail view didn't scroll up afterwards.
---
 html/views/history/history.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/html/views/history/history.js b/html/views/history/history.js
index 78184e8..af389ef 100644
--- a/html/views/history/history.js
+++ b/html/views/history/history.js
@@ -184,15 +184,18 @@ var loadCommit = function(commitObject, currentRef) {
 		}
 	}
 
+	// Scroll to top
+	scroll(0, 0);
+
+	if (!commit.parents)
+		return;
+
 	for (var i = 0; i < commit.parents.length; i++) {
 		var newRow = $("commit_header").insertRow(-1);
 		newRow.innerHTML = "<td class='property_name'>Parent:</td><td>" +
 			"<a href='' onclick='selectCommit(this.innerHTML); return false;'>" +
 			commit.parents[i] + "</a></td>";
 	}
-
-	// Scroll to top
-	scroll(0, 0);
 }
 
 var showDiff = function() {

From 46740dc3f31d34db1482e166ad3ce9d30a4ead17 Mon Sep 17 00:00:00 2001
From: Pieter de Bie <frimmirf+gitx@gmail.com>
Date: Mon, 15 Jun 2009 23:09:09 +0100
Subject: [PATCH 04/18] Remove use of deprecated stringWithCString

---
 PBGitBinary.m | 2 +-
 gitx.mm       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/PBGitBinary.m b/PBGitBinary.m
index 49ef7b7..ccb0b0b 100644
--- a/PBGitBinary.m
+++ b/PBGitBinary.m
@@ -66,7 +66,7 @@ static NSString* gitPath = nil;
 
 	// Try to find the path of the Git binary
 	char* path = getenv("GIT_PATH");
-	if (path && [self acceptBinary:[NSString stringWithCString:path]])
+	if (path && [self acceptBinary:[NSString stringWithUTF8String:path]])
 		return;
 
 	// No explicit path. Try it with "which"
diff --git a/gitx.mm b/gitx.mm
index fbd5411..f5f3044 100644
--- a/gitx.mm
+++ b/gitx.mm
@@ -132,7 +132,7 @@ int main(int argc, const char** argv)
 	NSMutableArray* arguments = [NSMutableArray arrayWithCapacity:argc];
 	int i = 0;
 	for (i = 0; i < argc; i++)
-		[arguments addObject: [NSString stringWithCString:argv[i]]];
+		[arguments addObject: [NSString stringWithUTF8String:argv[i]]];
 
 	if (!isatty(STDIN_FILENO) && fdopen(STDIN_FILENO, "r"))
 		handleSTDINDiff(proxy);

From 69759e74645d1939186fb4e2a5d3d9628b2c031f Mon Sep 17 00:00:00 2001
From: Pieter de Bie <frimmirf+gitx@gmail.com>
Date: Mon, 15 Jun 2009 23:09:29 +0100
Subject: [PATCH 05/18] PBGitConfig: Add missing sentinel

---
 PBGitConfig.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PBGitConfig.m b/PBGitConfig.m
index 3d4f156..9166cc4 100644
--- a/PBGitConfig.m
+++ b/PBGitConfig.m
@@ -79,7 +79,7 @@
 
 	// Check if it exists globally. In that case, write it as a global
 
-	NSArray *arguments = [NSArray arrayWithObjects:@"config", @"--global", @"--get", path];
+	NSArray *arguments = [NSArray arrayWithObjects:@"config", @"--global", @"--get", path, nil];
 	int ret;
 	[PBEasyPipe outputForCommand:[PBGitBinary path] withArgs:arguments inDir:nil retValue:&ret];
 	if (!ret) // It exists globally

From d04362ba824ce60bb12115330a0aa86e3bdce176 Mon Sep 17 00:00:00 2001
From: Pieter de Bie <frimmirf+gitx@gmail.com>
Date: Sun, 29 Mar 2009 00:46:18 +0000
Subject: [PATCH 06/18] History fileview: select current item on rightclick

---
 PBQLOutlineView.m | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/PBQLOutlineView.m b/PBQLOutlineView.m
index 4e620bd..24f43e1 100644
--- a/PBQLOutlineView.m
+++ b/PBQLOutlineView.m
@@ -58,6 +58,25 @@
 	return fileNames;
 }
 
+- (NSMenu *)menuForEvent:(NSEvent *)theEvent
+{
+	if ([theEvent type] == NSRightMouseDown)
+	{
+		// get the current selections for the outline view.
+		NSIndexSet *selectedRowIndexes = [self selectedRowIndexes];
+
+		// select the row that was clicked before showing the menu for the event
+		NSPoint mousePoint = [self convertPoint:[theEvent locationInWindow] fromView:nil];
+		int row = [self rowAtPoint:mousePoint];
+
+		// figure out if the row that was just clicked on is currently selected
+		if ([selectedRowIndexes containsIndex:row] == NO)
+			[self selectRow:row byExtendingSelection:NO];
+	}
+
+	return [super menuForEvent:theEvent];
+}
+
 /* Implemented to satisfy datasourcee protocol */
 - (BOOL) outlineView: (NSOutlineView *)ov
          isItemExpandable: (id)item { return NO; }

From d973dc5ba7cc4a33efbb79d5b3e429f12a5fabc0 Mon Sep 17 00:00:00 2001
From: Pieter de Bie <frimmirf+gitx@gmail.com>
Date: Sun, 29 Mar 2009 00:44:58 +0000
Subject: [PATCH 07/18] Display context menu in the history tree to show
 related commits

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
---
 PBGitHistoryController.h |  1 +
 PBGitHistoryController.m | 12 ++++++++
 PBGitHistoryView.xib     | 65 ++++++++++++++++++++++++++++++++++++----
 3 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/PBGitHistoryController.h b/PBGitHistoryController.h
index f87c462..f9b7f8f 100644
--- a/PBGitHistoryController.h
+++ b/PBGitHistoryController.h
@@ -41,6 +41,7 @@
 - (IBAction) toggleQuickView: sender;
 - (IBAction) openSelectedFile: sender;
 - (void) updateQuicklookForce: (BOOL) force;
+- (void) showCommitsFromTree:(id) sender;
 
 - (void) copyCommitInfo;
 
diff --git a/PBGitHistoryController.m b/PBGitHistoryController.m
index 9c18b72..6562465 100644
--- a/PBGitHistoryController.m
+++ b/PBGitHistoryController.m
@@ -218,4 +218,16 @@
 	return menu;
 }
 
+- (void) showCommitsFromTree:(id) sender
+{
+	// TODO: Enable this from webview as well!
+
+	NSMutableArray *filePaths = [NSMutableArray arrayWithObjects:@"HEAD", @"--", NULL];
+	for (PBGitTree *tree in [treeController selectedObjects])
+		[filePaths addObject:[tree fullPath]];
+	PBGitRevSpecifier *revSpec = [[PBGitRevSpecifier alloc] initWithParameters:filePaths];
+
+	repository.currentBranch = [repository addBranch:revSpec];
+}
+
 @end
diff --git a/PBGitHistoryView.xib b/PBGitHistoryView.xib
index 1a06286..2fdd4fa 100644
--- a/PBGitHistoryView.xib
+++ b/PBGitHistoryView.xib
@@ -2,12 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">9G55</string>
+		<string key="IBDocument.SystemVersion">9J61</string>
 		<string key="IBDocument.InterfaceBuilderVersion">677</string>
-		<string key="IBDocument.AppKitVersion">949.43</string>
+		<string key="IBDocument.AppKitVersion">949.46</string>
 		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
+			<integer value="275"/>
 			<integer value="237"/>
 			<integer value="27"/>
 		</object>
@@ -345,6 +346,7 @@
 														<object class="NSMutableArray" key="set.sortedObjects">
 															<bool key="EncodedWithXMLCoder">YES</bool>
 															<string>Apple HTML pasteboard type</string>
+															<string>Apple PDF pasteboard type</string>
 															<string>Apple PICT pasteboard type</string>
 															<string>Apple URL pasteboard type</string>
 															<string>Apple Web Archive pasteboard type</string>
@@ -355,6 +357,7 @@
 															<string>NeXT Rich Text Format v1.0 pasteboard type</string>
 															<string>NeXT TIFF v4.0 pasteboard type</string>
 															<string>WebURLsWithTitlesPboardType</string>
+															<string>public.png</string>
 															<string>public.url</string>
 															<string>public.url-name</string>
 														</object>
@@ -1515,6 +1518,20 @@
 					<bool key="EncodedWithXMLCoder">YES</bool>
 				</object>
 			</object>
+			<object class="NSMenu" id="500542810">
+				<string key="NSTitle"/>
+				<object class="NSMutableArray" key="NSMenuItems">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="NSMenuItem" id="661418857">
+						<reference key="NSMenu" ref="500542810"/>
+						<string key="NSTitle">Commits touching paths</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="908677745"/>
+						<reference key="NSMixedImage" ref="746375230"/>
+					</object>
+				</object>
+			</object>
 		</object>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<object class="NSMutableArray" key="connectionRecords">
@@ -2105,6 +2122,22 @@
 					</object>
 					<int key="connectionID">274</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">showCommitsFromTree:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="661418857"/>
+					</object>
+					<int key="connectionID">281</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">menu</string>
+						<reference key="source" ref="216928480"/>
+						<reference key="destination" ref="500542810"/>
+					</object>
+					<int key="connectionID">282</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -2735,6 +2768,20 @@
 						<reference key="object" ref="217429948"/>
 						<reference key="parent" ref="27300806"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">276</int>
+						<reference key="object" ref="500542810"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="661418857"/>
+						</object>
+						<reference key="parent" ref="1002"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">275</int>
+						<reference key="object" ref="661418857"/>
+						<reference key="parent" ref="500542810"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -2814,6 +2861,9 @@
 					<string>27.ImportedFromIB2</string>
 					<string>272.IBPluginDependency</string>
 					<string>273.IBPluginDependency</string>
+					<string>275.IBPluginDependency</string>
+					<string>276.IBEditorWindowLastContentRect</string>
+					<string>276.IBPluginDependency</string>
 					<string>28.IBPluginDependency</string>
 					<string>28.IBShouldRemoveOnLegacySave</string>
 					<string>29.IBPluginDependency</string>
@@ -2945,6 +2995,9 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{126, 715}, {223, 23}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
@@ -2978,7 +3031,7 @@
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{321, 79}, {852, 432}}</string>
+					<string>{{59, 317}, {852, 432}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3013,7 +3066,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">274</int>
+			<int key="maxID">282</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -3032,7 +3085,7 @@
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>PBGitHistoryController</string>
-							<string>id</string>
+							<string>PBWebHistoryController</string>
 							<string>WebView</string>
 						</object>
 					</object>
@@ -3053,6 +3106,7 @@
 							<string>setDetailedView:</string>
 							<string>setRawView:</string>
 							<string>setTreeView:</string>
+							<string>showCommitsFromTree:</string>
 							<string>toggleQuickView:</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
@@ -3063,6 +3117,7 @@
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">

From dc234cfdc9de05cb0c81a968412f76ef9204e33f Mon Sep 17 00:00:00 2001
From: Johannes Gilger <heipei@hackvalue.de>
Date: Sat, 13 Jun 2009 11:08:01 +0200
Subject: [PATCH 08/18] PBGitHistory: Add "Show in Finder" to files

This adds the "Show in Finder" menu-entry and logic to files in the
tree-view of the history. Also the button "Show commits touching paths"
was renamed to "Show history of files".

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
---
 PBGitHistoryController.h |  3 ++-
 PBGitHistoryController.m | 16 +++++++++++++++-
 PBGitHistoryView.xib     | 38 ++++++++++++++++++++++++++++++++------
 3 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/PBGitHistoryController.h b/PBGitHistoryController.h
index f9b7f8f..0007760 100644
--- a/PBGitHistoryController.h
+++ b/PBGitHistoryController.h
@@ -41,7 +41,8 @@
 - (IBAction) toggleQuickView: sender;
 - (IBAction) openSelectedFile: sender;
 - (void) updateQuicklookForce: (BOOL) force;
-- (void) showCommitsFromTree:(id) sender;
+- (void)showCommitsFromTree:(id)sender;
+- (void)showInFinderAction:(id)sender;
 
 - (void) copyCommitInfo;
 
diff --git a/PBGitHistoryController.m b/PBGitHistoryController.m
index 6562465..bdfb843 100644
--- a/PBGitHistoryController.m
+++ b/PBGitHistoryController.m
@@ -218,7 +218,7 @@
 	return menu;
 }
 
-- (void) showCommitsFromTree:(id) sender
+- (void)showCommitsFromTree:(id)sender
 {
 	// TODO: Enable this from webview as well!
 
@@ -230,4 +230,18 @@
 	repository.currentBranch = [repository addBranch:revSpec];
 }
 
+- (void)showInFinderAction:(id)sender
+{
+	NSString *workingDirectory = [[repository workingDirectory] stringByAppendingString:@"/"];
+	NSString *path;
+	NSWorkspace *ws = [NSWorkspace sharedWorkspace];
+
+	for (PBGitTree *tree in [treeController selectedObjects]) {
+		path = [workingDirectory stringByAppendingPathComponent:[tree fullPath]];
+		[ws selectFile: path inFileViewerRootedAtPath:path];
+	}
+
+}
+
+
 @end
diff --git a/PBGitHistoryView.xib b/PBGitHistoryView.xib
index 2fdd4fa..6e44446 100644
--- a/PBGitHistoryView.xib
+++ b/PBGitHistoryView.xib
@@ -8,9 +8,9 @@
 		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="275"/>
+			<integer value="276"/>
 			<integer value="237"/>
-			<integer value="27"/>
+			<integer value="9"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1524,7 +1524,15 @@
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<object class="NSMenuItem" id="661418857">
 						<reference key="NSMenu" ref="500542810"/>
-						<string key="NSTitle">Commits touching paths</string>
+						<string key="NSTitle">Show history of file(s)</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="908677745"/>
+						<reference key="NSMixedImage" ref="746375230"/>
+					</object>
+					<object class="NSMenuItem" id="85225954">
+						<reference key="NSMenu" ref="500542810"/>
+						<string key="NSTitle">Show in Finder</string>
 						<string key="NSKeyEquiv"/>
 						<int key="NSMnemonicLoc">2147483647</int>
 						<reference key="NSOnImage" ref="908677745"/>
@@ -2138,6 +2146,14 @@
 					</object>
 					<int key="connectionID">282</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">showInFinderAction:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="85225954"/>
+					</object>
+					<int key="connectionID">285</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -2774,6 +2790,7 @@
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="661418857"/>
+							<reference ref="85225954"/>
 						</object>
 						<reference key="parent" ref="1002"/>
 					</object>
@@ -2782,6 +2799,11 @@
 						<reference key="object" ref="661418857"/>
 						<reference key="parent" ref="500542810"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">284</int>
+						<reference key="object" ref="85225954"/>
+						<reference key="parent" ref="500542810"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -2866,6 +2888,7 @@
 					<string>276.IBPluginDependency</string>
 					<string>28.IBPluginDependency</string>
 					<string>28.IBShouldRemoveOnLegacySave</string>
+					<string>284.IBPluginDependency</string>
 					<string>29.IBPluginDependency</string>
 					<string>29.IBShouldRemoveOnLegacySave</string>
 					<string>3.IBPluginDependency</string>
@@ -2995,11 +3018,12 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{126, 715}, {223, 23}}</string>
+					<string>{{225, 683}, {202, 43}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
@@ -3031,7 +3055,7 @@
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{59, 317}, {852, 432}}</string>
+					<string>{{76, 44}, {852, 432}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3066,7 +3090,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">282</int>
+			<int key="maxID">285</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -3107,6 +3131,7 @@
 							<string>setRawView:</string>
 							<string>setTreeView:</string>
 							<string>showCommitsFromTree:</string>
+							<string>showInFinderAction:</string>
 							<string>toggleQuickView:</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
@@ -3118,6 +3143,7 @@
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">

From 47e182a9109cd055c0910370739ce2d71bef3513 Mon Sep 17 00:00:00 2001
From: Pieter de Bie <pdebie@ai.rug.nl>
Date: Tue, 16 Jun 2009 18:10:31 +0100
Subject: [PATCH 09/18] HistoryController: Add some marks

---
 PBGitHistoryController.m | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/PBGitHistoryController.m b/PBGitHistoryController.m
index bdfb843..00a09c7 100644
--- a/PBGitHistoryController.m
+++ b/PBGitHistoryController.m
@@ -203,6 +203,7 @@
 	[super removeView];
 }
 
+#pragma mark Table Column Methods
 - (NSMenu *)tableColumnMenu
 {
 	NSMenu *menu = [[NSMenu alloc] initWithTitle:@"Table columns menu"];
@@ -218,6 +219,8 @@
 	return menu;
 }
 
+#pragma mark Tree Context Menu Methods
+
 - (void)showCommitsFromTree:(id)sender
 {
 	// TODO: Enable this from webview as well!

From c9609f22b69260928b5f7979f6944116a5b8b424 Mon Sep 17 00:00:00 2001
From: Pieter de Bie <pdebie@ai.rug.nl>
Date: Tue, 16 Jun 2009 18:49:24 +0100
Subject: [PATCH 10/18] WebHistoryController: Refactor menu search to be
 recursive

This way it doesn't matter where in an element you click, as
long as one of its parents has the required attributes, you
get the menu
---
 PBWebHistoryController.m | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/PBWebHistoryController.m b/PBWebHistoryController.m
index 0f553b3..ca8bac7 100644
--- a/PBWebHistoryController.m
+++ b/PBWebHistoryController.m
@@ -76,21 +76,21 @@ contextMenuItemsForElement:(NSDictionary *)element
 {
 	DOMNode *node = [element valueForKey:@"WebElementDOMNode"];
 
-	// If clicked on the text, select the containing div
-	if ([[node className] isEqualToString:@"DOMText"])
+	while (node) {
+		// Every ref has a class name of 'refs' and some other class. We check on that to see if we pressed on a ref.
+		if ([[node className] hasPrefix:@"refs "]) {
+			NSString *selectedRefString = [[[node childNodes] item:0] textContent];
+			for (PBGitRef *ref in historyController.webCommit.refs)
+			{
+				if ([[ref shortName] isEqualToString:selectedRefString])
+					return [contextMenuDelegate menuItemsForRef:ref commit:historyController.webCommit];
+			}
+			NSLog(@"Could not find selected ref!");
+			return defaultMenuItems;
+		}
+
 		node = [node parentNode];
-
-	// Every ref has a class name of 'refs' and some other class. We check on that to see if we pressed on a ref.
-	if (![[node className] hasPrefix:@"refs "])
-		return defaultMenuItems;
-
-	NSString *selectedRefString = [[[node childNodes] item:0] textContent];
-	for (PBGitRef *ref in historyController.webCommit.refs)
-	{
-		if ([[ref shortName] isEqualToString:selectedRefString])
-			return [contextMenuDelegate menuItemsForRef:ref commit:historyController.webCommit];
 	}
-	NSLog(@"Could not find selected ref!");
 
 	return defaultMenuItems;
 }

From 1199c56e932a91bd4bd4154f47635787ef3bb893 Mon Sep 17 00:00:00 2001
From: Pieter de Bie <pdebie@ai.rug.nl>
Date: Tue, 16 Jun 2009 18:28:37 +0100
Subject: [PATCH 11/18] HistoryController: Use a programatically created
 context menu

This allows us to differentiate between one or multiple files,
and will also come in use when we want to create a context menu
from the webview later on

We now use representedObjects to store the selected paths.
That should make it possible to reuse the menu's from somewhere else.
---
 PBGitHistoryController.h |  4 ++
 PBGitHistoryController.m | 36 +++++++++++++++--
 PBGitHistoryView.xib     | 83 +++-------------------------------------
 PBQLOutlineView.m        |  2 +-
 4 files changed, 42 insertions(+), 83 deletions(-)

diff --git a/PBGitHistoryController.h b/PBGitHistoryController.h
index 0007760..f7298c4 100644
--- a/PBGitHistoryController.h
+++ b/PBGitHistoryController.h
@@ -41,6 +41,10 @@
 - (IBAction) toggleQuickView: sender;
 - (IBAction) openSelectedFile: sender;
 - (void) updateQuicklookForce: (BOOL) force;
+
+// Context menu methods
+- (NSMenu *)contextMenuForTreeView;
+- (NSArray *)menuItemsForPaths:(NSArray *)paths;
 - (void)showCommitsFromTree:(id)sender;
 - (void)showInFinderAction:(id)sender;
 
diff --git a/PBGitHistoryController.m b/PBGitHistoryController.m
index 00a09c7..a02c041 100644
--- a/PBGitHistoryController.m
+++ b/PBGitHistoryController.m
@@ -226,8 +226,8 @@
 	// TODO: Enable this from webview as well!
 
 	NSMutableArray *filePaths = [NSMutableArray arrayWithObjects:@"HEAD", @"--", NULL];
-	for (PBGitTree *tree in [treeController selectedObjects])
-		[filePaths addObject:[tree fullPath]];
+	[filePaths addObjectsFromArray:[sender representedObject]];
+
 	PBGitRevSpecifier *revSpec = [[PBGitRevSpecifier alloc] initWithParameters:filePaths];
 
 	repository.currentBranch = [repository addBranch:revSpec];
@@ -239,12 +239,40 @@
 	NSString *path;
 	NSWorkspace *ws = [NSWorkspace sharedWorkspace];
 
-	for (PBGitTree *tree in [treeController selectedObjects]) {
-		path = [workingDirectory stringByAppendingPathComponent:[tree fullPath]];
+	for (NSString *filePath in [sender representedObject]) {
+		path = [workingDirectory stringByAppendingPathComponent:filePath];
 		[ws selectFile: path inFileViewerRootedAtPath:path];
 	}
 
 }
 
+- (NSMenu *)contextMenuForTreeView
+{
+	NSArray *filePaths = [[treeController selectedObjects] valueForKey:@"fullPath"];
+
+	NSMenu *menu = [[NSMenu alloc] init];
+	for (NSMenuItem *item in [self menuItemsForPaths:filePaths])
+		[menu addItem:item];
+	return menu;
+}
+
+- (NSArray *)menuItemsForPaths:(NSArray *)paths
+{
+	BOOL multiple = [paths count] != 1;
+	NSMenuItem *finderItem = [[NSMenuItem alloc] initWithTitle:multiple? @"Show items in Finder" : @"Show item in Finder"
+														action:@selector(showInFinderAction:)
+												 keyEquivalent:@""];
+	NSMenuItem *historyItem = [[NSMenuItem alloc] initWithTitle:multiple? @"Show history of files" : @"Show history of file"
+														 action:@selector(showCommitsFromTree:)
+												 keyEquivalent:@""];
+
+	NSArray *menuItems = [NSArray arrayWithObjects:historyItem, finderItem, nil];
+	for (NSMenuItem *item in menuItems) {
+		[item setTarget:self];
+		[item setRepresentedObject:paths];
+	}
+
+	return menuItems;
+}
 
 @end
diff --git a/PBGitHistoryView.xib b/PBGitHistoryView.xib
index 6e44446..329d003 100644
--- a/PBGitHistoryView.xib
+++ b/PBGitHistoryView.xib
@@ -8,9 +8,8 @@
 		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="276"/>
 			<integer value="237"/>
-			<integer value="9"/>
+			<integer value="2"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1518,28 +1517,6 @@
 					<bool key="EncodedWithXMLCoder">YES</bool>
 				</object>
 			</object>
-			<object class="NSMenu" id="500542810">
-				<string key="NSTitle"/>
-				<object class="NSMutableArray" key="NSMenuItems">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSMenuItem" id="661418857">
-						<reference key="NSMenu" ref="500542810"/>
-						<string key="NSTitle">Show history of file(s)</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="908677745"/>
-						<reference key="NSMixedImage" ref="746375230"/>
-					</object>
-					<object class="NSMenuItem" id="85225954">
-						<reference key="NSMenu" ref="500542810"/>
-						<string key="NSTitle">Show in Finder</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="908677745"/>
-						<reference key="NSMixedImage" ref="746375230"/>
-					</object>
-				</object>
-			</object>
 		</object>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<object class="NSMutableArray" key="connectionRecords">
@@ -2130,30 +2107,6 @@
 					</object>
 					<int key="connectionID">274</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showCommitsFromTree:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="661418857"/>
-					</object>
-					<int key="connectionID">281</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">menu</string>
-						<reference key="source" ref="216928480"/>
-						<reference key="destination" ref="500542810"/>
-					</object>
-					<int key="connectionID">282</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showInFinderAction:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="85225954"/>
-					</object>
-					<int key="connectionID">285</int>
-				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -2784,26 +2737,6 @@
 						<reference key="object" ref="217429948"/>
 						<reference key="parent" ref="27300806"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">276</int>
-						<reference key="object" ref="500542810"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="661418857"/>
-							<reference ref="85225954"/>
-						</object>
-						<reference key="parent" ref="1002"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">275</int>
-						<reference key="object" ref="661418857"/>
-						<reference key="parent" ref="500542810"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">284</int>
-						<reference key="object" ref="85225954"/>
-						<reference key="parent" ref="500542810"/>
-					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -2883,12 +2816,8 @@
 					<string>27.ImportedFromIB2</string>
 					<string>272.IBPluginDependency</string>
 					<string>273.IBPluginDependency</string>
-					<string>275.IBPluginDependency</string>
-					<string>276.IBEditorWindowLastContentRect</string>
-					<string>276.IBPluginDependency</string>
 					<string>28.IBPluginDependency</string>
 					<string>28.IBShouldRemoveOnLegacySave</string>
-					<string>284.IBPluginDependency</string>
 					<string>29.IBPluginDependency</string>
 					<string>29.IBShouldRemoveOnLegacySave</string>
 					<string>3.IBPluginDependency</string>
@@ -3018,12 +2947,8 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{225, 683}, {202, 43}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
@@ -3055,7 +2980,7 @@
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{76, 44}, {852, 432}}</string>
+					<string>{{358, 67}, {852, 432}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3090,7 +3015,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">285</int>
+			<int key="maxID">286</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -3154,6 +3079,7 @@
 							<string>commitList</string>
 							<string>fileBrowser</string>
 							<string>searchField</string>
+							<string>treeContextMenu</string>
 							<string>treeController</string>
 							<string>webView</string>
 						</object>
@@ -3163,6 +3089,7 @@
 							<string>NSTableView</string>
 							<string>NSOutlineView</string>
 							<string>NSSearchField</string>
+							<string>NSMenu</string>
 							<string>NSTreeController</string>
 							<string>id</string>
 						</object>
diff --git a/PBQLOutlineView.m b/PBQLOutlineView.m
index 24f43e1..459d908 100644
--- a/PBQLOutlineView.m
+++ b/PBQLOutlineView.m
@@ -74,7 +74,7 @@
 			[self selectRow:row byExtendingSelection:NO];
 	}
 
-	return [super menuForEvent:theEvent];
+	return [controller contextMenuForTreeView];
 }
 
 /* Implemented to satisfy datasourcee protocol */

From a002e3316cd5ec6149ac63849050c9fb667fc35d Mon Sep 17 00:00:00 2001
From: Pieter de Bie <pdebie@ai.rug.nl>
Date: Tue, 16 Jun 2009 19:29:43 +0100
Subject: [PATCH 12/18] WebHistoryView: Also use the tree context menu

---
 PBWebHistoryController.m      |  2 ++
 html/views/history/history.js | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/PBWebHistoryController.m b/PBWebHistoryController.m
index ca8bac7..35979a4 100644
--- a/PBWebHistoryController.m
+++ b/PBWebHistoryController.m
@@ -88,6 +88,8 @@ contextMenuItemsForElement:(NSDictionary *)element
 			NSLog(@"Could not find selected ref!");
 			return defaultMenuItems;
 		}
+		if ([node hasAttributes] && [[node attributes] getNamedItem:@"representedFile"])
+			return [historyController menuItemsForPaths:[NSArray arrayWithObject:[[[node attributes] getNamedItem:@"representedFile"] value]]];
 
 		node = [node parentNode];
 	}
diff --git a/html/views/history/history.js b/html/views/history/history.js
index 087f802..b5270cd 100644
--- a/html/views/history/history.js
+++ b/html/views/history/history.js
@@ -202,26 +202,32 @@ var showDiff = function() {
 		var link = document.createElement("a");
 		link.setAttribute("href", "#" + id);
 		p.appendChild(link);
-		var buttonType = ""
+		var buttonType = "";
+		var finalFile = "";
 		if (name1 == name2) {
 			buttonType = "changed"
-			link.appendChild(document.createTextNode(name1));
+			finalFile = name1;
 			if (mode_change)
 				p.appendChild(document.createTextNode(" mode " + old_mode + " -> " + new_mode));
 		}
 		else if (name1 == "/dev/null") {
 			buttonType = "created";
-			link.appendChild(document.createTextNode(name2));
+			finalFile = name2;
 		}
 		else if (name2 == "/dev/null") {
 			buttonType = "deleted";
-			link.appendChild(document.createTextNode(name1));
+			finalFile = name1;
 		}
 		else {
 			buttonType = "renamed";
-			link.appendChild(document.createTextNode(name2));
+			finalFile = name2;
 			p.insertBefore(document.createTextNode(name1 + " -> "), link);
 		}
+
+		link.appendChild(document.createTextNode(finalFile));
+		button.setAttribute("representedFile", finalFile);
+		link.setAttribute("representedFile", finalFile);
+
 		button.setAttribute("class", "button " + buttonType);
 		button.appendChild(document.createTextNode(buttonType));
 		$("files").appendChild(button);

From 7427cbe05d1d96490c18d642d5ea613d0f8b4caf Mon Sep 17 00:00:00 2001
From: Pieter de Bie <pdebie@ai.rug.nl>
Date: Tue, 16 Jun 2009 19:40:18 +0100
Subject: [PATCH 13/18] HistoryController: Add "Open Files" menu item

---
 PBGitHistoryController.h |  1 +
 PBGitHistoryController.m | 24 ++++++++++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/PBGitHistoryController.h b/PBGitHistoryController.h
index f7298c4..6c99a20 100644
--- a/PBGitHistoryController.h
+++ b/PBGitHistoryController.h
@@ -47,6 +47,7 @@
 - (NSArray *)menuItemsForPaths:(NSArray *)paths;
 - (void)showCommitsFromTree:(id)sender;
 - (void)showInFinderAction:(id)sender;
+- (void)openFilesAction:(id)sender;
 
 - (void) copyCommitInfo;
 
diff --git a/PBGitHistoryController.m b/PBGitHistoryController.m
index a02c041..c4d2679 100644
--- a/PBGitHistoryController.m
+++ b/PBGitHistoryController.m
@@ -246,6 +246,19 @@
 
 }
 
+- (void)openFilesAction:(id)sender
+{
+	NSString *workingDirectory = [[repository workingDirectory] stringByAppendingString:@"/"];
+	NSString *path;
+	NSWorkspace *ws = [NSWorkspace sharedWorkspace];
+
+	for (NSString *filePath in [sender representedObject]) {
+		path = [workingDirectory stringByAppendingPathComponent:filePath];
+		[ws openFile:path];
+	}
+}
+
+
 - (NSMenu *)contextMenuForTreeView
 {
 	NSArray *filePaths = [[treeController selectedObjects] valueForKey:@"fullPath"];
@@ -259,14 +272,17 @@
 - (NSArray *)menuItemsForPaths:(NSArray *)paths
 {
 	BOOL multiple = [paths count] != 1;
-	NSMenuItem *finderItem = [[NSMenuItem alloc] initWithTitle:multiple? @"Show items in Finder" : @"Show item in Finder"
-														action:@selector(showInFinderAction:)
-												 keyEquivalent:@""];
 	NSMenuItem *historyItem = [[NSMenuItem alloc] initWithTitle:multiple? @"Show history of files" : @"Show history of file"
 														 action:@selector(showCommitsFromTree:)
 												 keyEquivalent:@""];
+	NSMenuItem *finderItem = [[NSMenuItem alloc] initWithTitle:@"Show in Finder"
+														action:@selector(showInFinderAction:)
+												 keyEquivalent:@""];
+	NSMenuItem *openFilesItem = [[NSMenuItem alloc] initWithTitle:multiple? @"Open Files" : @"Open File"
+														   action:@selector(openFilesAction:)
+													keyEquivalent:@""];
 
-	NSArray *menuItems = [NSArray arrayWithObjects:historyItem, finderItem, nil];
+	NSArray *menuItems = [NSArray arrayWithObjects:historyItem, finderItem, openFilesItem, nil];
 	for (NSMenuItem *item in menuItems) {
 		[item setTarget:self];
 		[item setRepresentedObject:paths];

From d6ccf34881d1c178d4def0dfc9797d9d0fdb3ef0 Mon Sep 17 00:00:00 2001
From: Pieter de Bie <frimmirf+gitx@gmail.com>
Date: Sat, 20 Jun 2009 21:10:38 +0100
Subject: [PATCH 14/18] CommitController: Reject merges

We don't support this in any way yet, so let's just
issue a warning rather than failing silently
---
 PBGitCommitController.m | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/PBGitCommitController.m b/PBGitCommitController.m
index f41ffe2..d74e2a5 100644
--- a/PBGitCommitController.m
+++ b/PBGitCommitController.m
@@ -318,6 +318,11 @@
 
 - (IBAction) commit:(id) sender
 {
+	if ([[NSFileManager defaultManager] fileExistsAtPath:[repository.fileURL.path stringByAppendingPathComponent:@"MERGE_HEAD"]]) {
+		[[repository windowController] showMessageSheet:@"Cannot commit merges" infoText:@"GitX cannot commit merges yet. Please commit your changes from the command line."];
+		return;
+	}
+
 	if ([[cachedFilesController arrangedObjects] count] == 0) {
 		[[repository windowController] showMessageSheet:@"No changes to commit" infoText:@"You must first stage some changes before committing"];
 		return;

From 34f72ba27ab7217caae8b6453dba82558a866159 Mon Sep 17 00:00:00 2001
From: Johannes Gilger <heipei@hackvalue.de>
Date: Wed, 17 Jun 2009 13:07:39 +0200
Subject: [PATCH 15/18] PBGitIndexController: Renamed "Revert" to "Discard"

In keeping consistent with the Discard-Hunk functionality we rename the
former "Revert changes" on file-level to "Discard changes". Along with
the menu-item all the functions and variables have been renamed
accordingly. Also get rid of an unnecessary force-function.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
---
 PBGitIndexController.m | 56 ++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/PBGitIndexController.m b/PBGitIndexController.m
index 9ecec78..97169f1 100644
--- a/PBGitIndexController.m
+++ b/PBGitIndexController.m
@@ -157,8 +157,18 @@
 	return [commitController.repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"diff-files", [self contextParameter], @"--", file.path, nil]];
 }
 
-- (void) forceRevertChangesForFiles:(NSArray *)files
+- (void)discardChangesForFiles:(NSArray *)files force:(BOOL)force
 {
+	if(!force) {
+		int ret = [[NSAlert alertWithMessageText:@"Discard changes"
+					   defaultButton:nil
+					 alternateButton:@"Cancel"
+					     otherButton:nil
+			       informativeTextWithFormat:@"Are you sure you wish to discard the changes to this file?\n\nYou cannot undo this operation."] runModal];
+		if (ret != NSAlertDefaultReturn)
+			return;
+	}
+
 	NSArray *paths = [files valueForKey:@"path"];
 	NSString *input = [paths componentsJoinedByString:@"\0"];
 
@@ -166,7 +176,7 @@
 	int ret = 1;
 	[commitController.repository outputForArguments:arguments inputString:input retValue:&ret];
 	if (ret) {
-		[[commitController.repository windowController] showMessageSheet:@"Reverting changes failed" infoText:[NSString stringWithFormat:@"Reverting changes failed with error code %i", ret]];
+		[[commitController.repository windowController] showMessageSheet:@"Discarding changes failed" infoText:[NSString stringWithFormat:@"Discarding changes failed with error code %i", ret]];
 		return;
 	}
 
@@ -174,18 +184,6 @@
 		file.hasUnstagedChanges = NO;
 }
 
-- (void) revertChangesForFiles:(NSArray *)files
-{
-	int ret = [[NSAlert alertWithMessageText:@"Revert changes"
-					 defaultButton:nil
-				   alternateButton:@"Cancel"
-					   otherButton:nil
-		 informativeTextWithFormat:@"Are you sure you wish to revert changes?\n\n You cannot undo this operation."] runModal];
-
-	if (ret == NSAlertDefaultReturn)
-		[self forceRevertChangesForFiles:files];
-}
-
 
 # pragma mark Context Menu methods
 - (BOOL) allSelectedCanBeIgnored:(NSArray *)selectedFiles
@@ -244,19 +242,19 @@
 		if (!file.hasUnstagedChanges)
 			return menu;
 
-	NSMenuItem *revertItem = [[NSMenuItem alloc] initWithTitle:@"Revert Changes…" action:@selector(revertFilesAction:) keyEquivalent:@""];
-	[revertItem setTarget:self];
-	[revertItem setAlternate:NO];
-	[revertItem setRepresentedObject:selectedFiles];
+	NSMenuItem *discardItem = [[NSMenuItem alloc] initWithTitle:@"Discard changes" action:@selector(discardFilesAction:) keyEquivalent:@""];
+	[discardItem setTarget:self];
+	[discardItem setAlternate:NO];
+	[discardItem setRepresentedObject:selectedFiles];
 
-	[menu addItem:revertItem];
+	[menu addItem:discardItem];
 
-	NSMenuItem *revertForceItem = [[NSMenuItem alloc] initWithTitle:@"Revert Changes" action:@selector(forceRevertFilesAction:) keyEquivalent:@""];
-	[revertForceItem setTarget:self];
-	[revertForceItem setAlternate:YES];
-	[revertForceItem setRepresentedObject:selectedFiles];
-	[revertForceItem setKeyEquivalentModifierMask:NSAlternateKeyMask];
-	[menu addItem:revertForceItem];
+	NSMenuItem *discardForceItem = [[NSMenuItem alloc] initWithTitle:@"Discard changes" action:@selector(forceDiscardFilesAction:) keyEquivalent:@""];
+	[discardForceItem setTarget:self];
+	[discardForceItem setAlternate:YES];
+	[discardForceItem setRepresentedObject:selectedFiles];
+	[discardForceItem setKeyEquivalentModifierMask:NSAlternateKeyMask];
+	[menu addItem:discardForceItem];
 	
 	return menu;
 }
@@ -288,18 +286,18 @@
 	[commitController refresh:NULL];
 }
 
-- (void) revertFilesAction:(id) sender
+- (void)discardFilesAction:(id) sender
 {
 	NSArray *selectedFiles = [sender representedObject];
 	if ([selectedFiles count] > 0)
-		[self revertChangesForFiles:selectedFiles];
+		[self discardChangesForFiles:selectedFiles force:FALSE];
 }
 
-- (void) forceRevertFilesAction:(id) sender
+- (void)forceDiscardFilesAction:(id) sender
 {
 	NSArray *selectedFiles = [sender representedObject];
 	if ([selectedFiles count] > 0)
-		[self forceRevertChangesForFiles:selectedFiles];
+		[self discardChangesForFiles:selectedFiles force:TRUE];
 }
 
 - (void) showInFinderAction:(id) sender

From fa6182e2a4024230cce462b16cd4185cca2e7731 Mon Sep 17 00:00:00 2001
From: Benoit Cerrina <benoitcerrina@benoit-cerrinas-imac.local>
Date: Sat, 20 Jun 2009 16:02:03 -0400
Subject: [PATCH 16/18] PBGitRepository: Fix opening of large directories due
 to bug in NSFileWrapper.

This commit changes  readFromFileWrapper:ofType:error: to readFromURL:ofType:error:.

The default implementation of readFromURL calls readFromFileWrapper, but a bug
in NSFileWrapper makes this fail with repositories with a large number of files
(not sure if the fact that those files were in subdirectories matter or not).

So instead we skip the whole FileWrapper thing, which we don't really use anyway,
and just use the URL.
---
 PBGitRepository.m | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/PBGitRepository.m b/PBGitRepository.m
index 89691f9..72e1495 100644
--- a/PBGitRepository.m
+++ b/PBGitRepository.m
@@ -72,7 +72,11 @@ NSString* PBGitRepositoryErrorDomain = @"GitXErrorDomain";
 	return repositoryURL;
 }
 
-- (BOOL)readFromFileWrapper:(NSFileWrapper *)fileWrapper ofType:(NSString *)typeName error:(NSError **)outError
+// NSFileWrapper is broken and doesn't work when called on a directory containing a large number of directories and files.
+//because of this it is safer to implement readFromURL than readFromFileWrapper.
+//Because NSFileManager does not attempt to recursively open all directories and file when fileExistsAtPath is called
+//this works much better.
+- (BOOL)readFromURL:(NSURL *)absoluteURL ofType:(NSString *)typeName error:(NSError **)outError
 {
 	BOOL success = NO;
 
@@ -85,11 +89,12 @@ NSString* PBGitRepositoryErrorDomain = @"GitXErrorDomain";
 		}
 		return NO;
 	}
-
-	if (![fileWrapper isDirectory]) {
+	BOOL lIsDirectory = FALSE;
+	[[NSFileManager defaultManager] fileExistsAtPath:[absoluteURL path] isDirectory:&lIsDirectory];
+	if (!lIsDirectory) {
 		if (outError) {
-			NSDictionary* userInfo = [NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"Reading files is not supported.", [fileWrapper filename]]
-                                                              forKey:NSLocalizedRecoverySuggestionErrorKey];
+			NSDictionary* userInfo = [NSDictionary dictionaryWithObject:@"Reading files is not supported."
+																 forKey:NSLocalizedRecoverySuggestionErrorKey];
 			*outError = [NSError errorWithDomain:PBGitRepositoryErrorDomain code:0 userInfo:userInfo];
 		}
 	} else {
@@ -98,8 +103,8 @@ NSString* PBGitRepositoryErrorDomain = @"GitXErrorDomain";
 			[self setFileURL:gitDirURL];
 			success = YES;
 		} else if (outError) {
-			NSDictionary* userInfo = [NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"%@ does not appear to be a git repository.", [fileWrapper filename]]
-                                                              forKey:NSLocalizedRecoverySuggestionErrorKey];
+			NSDictionary* userInfo = [NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"%@ does not appear to be a git repository.", [self fileName]]
+																 forKey:NSLocalizedRecoverySuggestionErrorKey];
 			*outError = [NSError errorWithDomain:PBGitRepositoryErrorDomain code:0 userInfo:userInfo];
 		}
 

From fa6ff44d0b219db90051ad56123bdd0761212653 Mon Sep 17 00:00:00 2001
From: Pieter de Bie <frimmirf+gitx@gmail.com>
Date: Sat, 20 Jun 2009 21:26:59 +0100
Subject: [PATCH 17/18] PBGitRepository: Clean up the readFromURL: method

We used a BOOL value which was returned afterwards,
but we might as well just return early and simplify everything
---
 PBGitRepository.m | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/PBGitRepository.m b/PBGitRepository.m
index 72e1495..821cd2a 100644
--- a/PBGitRepository.m
+++ b/PBGitRepository.m
@@ -78,8 +78,6 @@ NSString* PBGitRepositoryErrorDomain = @"GitXErrorDomain";
 //this works much better.
 - (BOOL)readFromURL:(NSURL *)absoluteURL ofType:(NSString *)typeName error:(NSError **)outError
 {
-	BOOL success = NO;
-
 	if (![PBGitBinary path])
 	{
 		if (outError) {
@@ -89,32 +87,33 @@ NSString* PBGitRepositoryErrorDomain = @"GitXErrorDomain";
 		}
 		return NO;
 	}
-	BOOL lIsDirectory = FALSE;
-	[[NSFileManager defaultManager] fileExistsAtPath:[absoluteURL path] isDirectory:&lIsDirectory];
-	if (!lIsDirectory) {
+
+	BOOL isDirectory = FALSE;
+	[[NSFileManager defaultManager] fileExistsAtPath:[absoluteURL path] isDirectory:&isDirectory];
+	if (!isDirectory) {
 		if (outError) {
 			NSDictionary* userInfo = [NSDictionary dictionaryWithObject:@"Reading files is not supported."
 																 forKey:NSLocalizedRecoverySuggestionErrorKey];
 			*outError = [NSError errorWithDomain:PBGitRepositoryErrorDomain code:0 userInfo:userInfo];
 		}
-	} else {
-		NSURL* gitDirURL = [PBGitRepository gitDirForURL:[self fileURL]];
-		if (gitDirURL) {
-			[self setFileURL:gitDirURL];
-			success = YES;
-		} else if (outError) {
+		return NO;
+	}
+
+
+	NSURL* gitDirURL = [PBGitRepository gitDirForURL:[self fileURL]];
+	if (!gitDirURL) {
+		if (outError) {
 			NSDictionary* userInfo = [NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"%@ does not appear to be a git repository.", [self fileName]]
 																 forKey:NSLocalizedRecoverySuggestionErrorKey];
 			*outError = [NSError errorWithDomain:PBGitRepositoryErrorDomain code:0 userInfo:userInfo];
 		}
-
-		if (success) {
-			[self setup];
-			[self readCurrentBranch];
-		}
+		return NO;
 	}
 
-	return success;
+	[self setFileURL:gitDirURL];
+	[self setup];
+	[self readCurrentBranch];
+	return YES;
 }
 
 - (void) setup

From a03401dd51cccd5c8ea191016f7cc149143fb7bd Mon Sep 17 00:00:00 2001
From: Pieter de Bie <frimmirf+gitx@gmail.com>
Date: Sat, 20 Jun 2009 21:58:34 +0100
Subject: [PATCH 18/18] CommitController: Don't turn of off automatic
 rearranging

In a6b7c0c2a6 (GitCommitController: Also use dictionary lookup for untracked files),
we started using a dictionary when updating the index to avoid O(n^2) lookups
and make the code cleaner at the same time.

Before that change we temporarily stopped tracking the index, so that
the controller wasn't fired with hundreds of KVO notifications. in a6b7c0c2a6,
we removed the re-tracked, but accidentally kept the untracking portion, which
meant that some index changes would not propagate to the controllers.
---
 PBGitCommitController.m | 1 -
 1 file changed, 1 deletion(-)

diff --git a/PBGitCommitController.m b/PBGitCommitController.m
index d74e2a5..5b29f68 100644
--- a/PBGitCommitController.m
+++ b/PBGitCommitController.m
@@ -195,7 +195,6 @@
 
 - (void) readOtherFiles:(NSNotification *)notification;
 {
-	[unstagedFilesController setAutomaticallyRearrangesObjects:NO];
 	NSArray *lines = [self linesFromNotification:notification];
 	NSMutableDictionary *dictionary = [[NSMutableDictionary alloc] initWithCapacity:[lines count]];
 	// We fake this files status as good as possible.