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

Merge commit '9e2618c3ea0e0517e156c3e04b9dba356311f361'

Browse Source 
* commit '9e2618c3ea0e0517e156c3e04b9dba356311f361':
  Reorder project
  CommitView: Allow committing per hunk
This commit is contained in:
Pieter de Bie
2008-10-28 23:08:13 +01:00
parent d491f3b3ae 9e2618c3ea
commit 9382cbf266
9 changed files with 126 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/views/commit/commit.js
+56 -6
View File
@@ -13,22 +13,72 @@ var showNewFile = function(file)
}
var showFileChanges = function(file, cached) {
var diff = $("diff");
diff.style.display = 'none';
$("diff").style.display = 'none';
hideNotification();
if (file.status == 0) // New file?
return showNewFile(file);
var changes;
if (cached) {
$("title").innerHTML = "Staged changes for " + file.path;
diff.innerHTML = file.cachedChangesAmend_(Controller.amend()).escapeHTML();
changes = file.cachedChangesAmend_(Controller.amend());
}
else {
$("title").innerHTML = "Unstaged changes for " + file.path;
diff.innerHTML = file.unstagedChanges().escapeHTML();
changes = file.unstagedChanges();
}
if (changes == "") {
notify("This file has no more changes", 1);
return;
}
displayDiff(changes, cached);
$("diff").style.display = '';
}
var diffHeader;
var originalDiff;
var displayDiff = function(diff, cached)
{
diffHeader = diff.split("\n").slice(0,4).join("\n");
originalDiff = diff;
$("diff").innerHTML = diff.escapeHTML();
highlightDiffs();
diff.style.display = '';
}
hunkHeaders = $("diff").getElementsByClassName("hunkheader");
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;
}
}
var addHunk = function(hunk, reverse)
{
hunkHeader = hunk.nextSibling.data.split("\n")[0];
if (m = hunkHeader.match(/@@.*@@/))
hunkHeader = m;
start = originalDiff.indexOf(hunkHeader);
end = originalDiff.indexOf("\n@@", start + 1);
end2 = originalDiff.indexOf("\ndiff", start + 1);
if (end2 < end && end2 > 0)
end = end2;
if (end == -1)
end = originalDiff.length;
hunkText = originalDiff.substring(start, end);
hunkText = diffHeader + "\n" + hunkText + "\n";
if (Controller.stageHunk_reverse_)
Controller.stageHunk_reverse_(hunkText, reverse);
else
alert(hunkText);
}