PBWebChanges: Allow discarding of hunks

This enables a "discard" button for unstaged hunks which simply gets rid of the
changes (by using "git apply --reverse").

To avoid repetition, the stageHunk method was split into a more generic
processHunk method. The "discard" functionality is called through
discardHunk.

The NSAlert shown when discarding can be bypassed by pressing "Alt"
while clicking the discard-button.

Signed-off-by: Johannes Gilger <[email protected]>

Author: heipei

PBGitCommitController.h

@@ -42,6 +42,7 @@
 - (void) readOtherFiles:(NSNotification *)notification;
 - (void) readUnstagedFiles:(NSNotification *)notification;
 - (void) stageHunk: (NSString *)hunk reverse:(BOOL)reverse;
+- (void)discardHunk:(NSString *)hunk;
 
 - (NSString *)parentTree;
 

PBGitCommitController.m

@@ -17,6 +17,7 @@ - (NSArray *) linesFromNotification:(NSNotification *)notification;
 - (void) doneProcessingIndex;
 - (NSMutableDictionary *)dictionaryForLines:(NSArray *)lines;
 - (void) addFilesFromDictionary:(NSMutableDictionary *)dictionary staged:(BOOL)staged tracked:(BOOL)tracked;
+- (void)processHunk:(NSString *)hunk stage:(BOOL)stage reverse:(BOOL)reverse;
 @end
 
 @implementation PBGitCommitController
@@ -366,7 +367,19 @@ - (IBAction) commit:(id) sender
 
 - (void) stageHunk:(NSString *)hunk reverse:(BOOL)reverse
 {
-	NSMutableArray *array = [NSMutableArray arrayWithObjects:@"apply", @"--cached", nil];
+	[self processHunk:hunk stage:TRUE reverse:reverse];
+}
+
+- (void)discardHunk:(NSString *)hunk
+{
+	[self processHunk:hunk stage:FALSE reverse:TRUE];
+}
+
+- (void)processHunk:(NSString *)hunk stage:(BOOL)stage reverse:(BOOL)reverse
+{
+	NSMutableArray *array = [NSMutableArray arrayWithObjects:@"apply", nil];
+	if (stage)
+		[array addObject:@"--cached"];
 	if (reverse)
 		[array addObject:@"--reverse"];
 
@@ -382,4 +395,5 @@ - (void) stageHunk:(NSString *)hunk reverse:(BOOL)reverse
 	// TODO: We should do this smarter by checking if the file diff is empty, which is faster.
 	[self refresh:self]; 
 }
+
 @end

PBWebChangesController.m

@@ -87,6 +87,23 @@ - (void) stageHunk:(NSString *)hunk reverse:(BOOL)reverse
 	[self refresh];
 }
 
+- (void)discardHunk:(NSString *)hunk altKey:(BOOL)altKey
+{
+	int ret = NSAlertDefaultReturn;
+	if (!altKey) {
+		ret = [[NSAlert alertWithMessageText:@"Discard hunk"
+			defaultButton:nil
+			alternateButton:@"Cancel"
+			otherButton:nil
+			informativeTextWithFormat:@"Are you sure you wish to discard the changes in this hunk?\n\n You cannot undo this operation."] runModal];
+	}
+
+	if (ret == NSAlertDefaultReturn) {
+		[controller discardHunk:hunk];
+		[self refresh];
+	}
+}
+
 - (void) setStateMessage:(NSString *)state
 {
 	id script = [view windowScriptObject];

html/views/commit/commit.css

@@ -60,11 +60,12 @@ table.diff {
 	float: right;
 }
 
-.diff a.stagebutton {
+.diff a.hunkbutton {
 	width: 40px;
 	padding: 0 2px 0 2px;
 	margin-bottom: 4px;
-	margin-right: 10px;
+	margin-right: 1px;
+	float: right;
 
 	border: 1px solid #3465a4;
 	background-color: #cce5ff;

html/views/commit/commit.js

@@ -87,15 +87,28 @@ var displayDiff = function(diff, cached)
 	for (i = 0; i < hunkHeaders.length; ++i) {
 		var header = hunkHeaders[i];
 		if (cached)
-			header.innerHTML = "<a href='#' class='stagebutton' onclick='addHunk(this, true); return false'>Unstage</a>" + header.innerHTML;
-		else
-			header.innerHTML = "<a href='#' class='stagebutton' onclick='addHunk(this, false); return false'>Stage</a>" + header.innerHTML;
+			header.innerHTML = "<a href='#' class='hunkbutton' onclick='addHunk(this, true); return false'>Unstage</a>" + header.innerHTML;
+		else {
+			header.innerHTML = "<a href='#' class='hunkbutton' onclick='addHunk(this, false); return false'>Stage</a>" + header.innerHTML;
+			header.innerHTML = "<a href='#' class='hunkbutton' onclick='discardHunk(this, event); return false'>Discard</a>" + header.innerHTML;
+		}
 	}
 }
 
-var addHunk = function(hunk, reverse)
+var getNextText = function(element)
+{
+	// gets the next DOM sibling which has type "text" (e.g. our hunk-header)
+	next = element;
+	while (next.nodeType != 3) {
+		next = next.nextSibling;
+	}
+	return next;
+}
+
+var getHunkText = function(hunk)
 {
-	hunkHeader = hunk.nextSibling.data.split("\n")[0];
+	hunk = getNextText(hunk);
+	hunkHeader = hunk.data.split("\n")[0];
 	if (m = hunkHeader.match(/@@.*@@/))
 		hunkHeader = m;
 
@@ -108,11 +121,29 @@ var addHunk = function(hunk, reverse)
 	if (end == -1)
 		end = originalDiff.length;
 
-	hunkText = originalDiff.substring(start, end);
+	var hunkText = originalDiff.substring(start, end);
 	hunkText = diffHeader + "\n" + hunkText + "\n";
 
+	return hunkText;
+}
+
+var addHunk = function(hunk, reverse)
+{
+	var hunkText = getHunkText(hunk);
+
 	if (Controller.stageHunk_reverse_)
 		Controller.stageHunk_reverse_(hunkText, reverse);
 	else
 		alert(hunkText);
 }
+
+var discardHunk = function(hunk, event)
+{
+	var hunkText = getHunkText(hunk);
+
+	if (Controller.discardHunk_altKey_) {
+		Controller.discardHunk_altKey_(hunkText, event.altKey == true);
+	} else {
+		alert(hunkText);
+	}
+}