kennethreitz-archive/gitx
1
0
Fork 0
mirror of https://github.com/kennethreitz-archive/gitx.git synced 2026-06-05 23:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

PBWebChanges: Allow discarding of hunks

Browse Source 
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 <heipei@hackvalue.de>
This commit is contained in:
Johannes Gilger
2009-05-29 14:08:35 +02:00
committed by Pieter de Bie
parent 76f1469f52
commit 7b6393570f
5 changed files with 73 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/views/commit/commit.js
+37 -6
View File
@@ -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)
{
hunkHeader = hunk.nextSibling.data.split("\n")[0];
// 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)
{
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);
}
}