copy, rename and friends
This commit is contained in:
Rodrigo Fernandes
parent
56a122ce2b
commit
89b9b3926d
5 changed files with 181 additions and 48 deletions
|
|
@ -64,12 +64,12 @@
|
|||
var values;
|
||||
|
||||
if (values = /^@@ -(\d+),\d+ \+(\d+),\d+ @@.*/.exec(line)) {
|
||||
currentFile.isTripleDiff = false;
|
||||
currentFile.isCombined = false;
|
||||
} else if (values = /^@@@ -(\d+),\d+ -\d+,\d+ \+(\d+),\d+ @@@.*/.exec(line)) {
|
||||
currentFile.isTripleDiff = true;
|
||||
currentFile.isCombined = true;
|
||||
} else {
|
||||
values = [0, 0];
|
||||
currentFile.isTripleDiff = false;
|
||||
currentFile.isCombined = false;
|
||||
}
|
||||
|
||||
oldLine = values[1];
|
||||
|
|
@ -120,23 +120,82 @@
|
|||
// Unmerged paths, and possibly other non-diffable files
|
||||
// https://github.com/scottgonzalez/pretty-diff/issues/11
|
||||
// Also, remove some useless lines
|
||||
if (!line || utils.startsWith(line, "*") ||
|
||||
utils.startsWith(line, "new") || utils.startsWith(line, "index")) {
|
||||
if (!line || utils.startsWith(line, "*")) {
|
||||
//|| utils.startsWith(line, "new") || utils.startsWith(line, "index")
|
||||
return;
|
||||
}
|
||||
|
||||
/* Diff */
|
||||
var oldMode = /old mode (\d{6})/;
|
||||
var newMode = /new mode (\d{6})/;
|
||||
var deletedFileMode = /deleted file mode (\d{6})/;
|
||||
var newFileMode = /new file mode (\d{6})/;
|
||||
|
||||
var copyFrom = /copy from (.+)/;
|
||||
var copyTo = /copy to (.+)/;
|
||||
|
||||
var renameFrom = /rename from (.+)/;
|
||||
var renameTo = /rename to (.+)/;
|
||||
|
||||
var similarityIndex = /similarity index (\d+)%/;
|
||||
var dissimilarityIndex = /dissimilarity index (\d+)%/;
|
||||
var index = /index ([0-9a-z]+)..([0-9a-z]+) (\d{6})?/;
|
||||
|
||||
/* Combined Diff */
|
||||
var combinedIndex = /index ([0-9a-z]+),([0-9a-z]+)..([0-9a-z]+)/;
|
||||
var combinedMode = /mode (\d{6}),(\d{6})..(\d{6})/;
|
||||
var combinedNewFile = /new file mode (\d{6})/;
|
||||
var combinedDeletedFile = /deleted file mode (\d{6}),(\d{6})/;
|
||||
|
||||
var values = [];
|
||||
if (utils.startsWith(line, "diff")) {
|
||||
startFile();
|
||||
} else if (currentFile && !currentFile.oldName && (values = /^--- a\/(\S+).*$/.exec(line))) {
|
||||
currentFile.oldName = values[1];
|
||||
currentFile.language = getExtension(currentFile.oldName, currentFile.language);
|
||||
} else if (currentFile && !currentFile.newName && (values = /^\+\+\+ [b]?\/(\S+).*$/.exec(line))) {
|
||||
currentFile.newName = values[1];
|
||||
|
||||
var fileSplit = currentFile.newName.split(".");
|
||||
currentFile.language = fileSplit[fileSplit.length - 1];
|
||||
currentFile.language = getExtension(currentFile.newName, currentFile.language);
|
||||
} else if (currentFile && utils.startsWith(line, "@@")) {
|
||||
startBlock(line);
|
||||
} else if ((values = oldMode.exec(line))) {
|
||||
currentFile.oldMode = values[1];
|
||||
} else if ((values = newMode.exec(line))) {
|
||||
currentFile.newMode = values[1];
|
||||
} else if ((values = deletedFileMode.exec(line))) {
|
||||
currentFile.deletedFileMode = values[1];
|
||||
} else if ((values = newFileMode.exec(line))) {
|
||||
currentFile.newFileMode = values[1];
|
||||
} else if ((values = copyFrom.exec(line))) {
|
||||
currentFile.oldName = values[1];
|
||||
currentFile.isCopy = true;
|
||||
} else if ((values = copyTo.exec(line))) {
|
||||
currentFile.newName = values[1];
|
||||
currentFile.isCopy = true;
|
||||
} else if ((values = renameFrom.exec(line))) {
|
||||
currentFile.oldName = values[1];
|
||||
currentFile.isRename = true;
|
||||
} else if ((values = renameTo.exec(line))) {
|
||||
currentFile.newName = values[1];
|
||||
currentFile.isRename = true;
|
||||
} else if ((values = similarityIndex.exec(line))) {
|
||||
currentFile.unchangedPercentage = values[1];
|
||||
} else if ((values = dissimilarityIndex.exec(line))) {
|
||||
currentFile.changedPercentage = values[1];
|
||||
} else if ((values = index.exec(line))) {
|
||||
currentFile.checksumBefore = values[1];
|
||||
currentFile.checksumAfter = values[2];
|
||||
values[2] && (currentFile.mode = values[3]);
|
||||
} else if ((values = combinedIndex.exec(line))) {
|
||||
currentFile.checksumBefore = [values[2], values[3]];
|
||||
currentFile.checksumAfter = values[1];
|
||||
} else if ((values = combinedMode.exec(line))) {
|
||||
currentFile.oldMode = [values[2], values[3]];
|
||||
currentFile.newMode = values[1];
|
||||
} else if ((values = combinedNewFile.exec(line))) {
|
||||
currentFile.newFileMode = values[1];
|
||||
} else if ((values = combinedDeletedFile.exec(line))) {
|
||||
currentFile.deletedFileMode = values[1];
|
||||
} else if (currentBlock) {
|
||||
createLine(line);
|
||||
}
|
||||
|
|
@ -148,6 +207,12 @@
|
|||
return files;
|
||||
};
|
||||
|
||||
function getExtension(filename, language) {
|
||||
var nameSplit = filename.split(".");
|
||||
if (nameSplit.length > 1) return nameSplit[nameSplit.length - 1];
|
||||
else return language;
|
||||
}
|
||||
|
||||
if (typeof module !== 'undefined' && module.exports) {
|
||||
module.exports.DiffParser = new DiffParser();
|
||||
} else if (typeof global.DiffParser === 'undefined') {
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
*/
|
||||
Diff2Html.prototype.getPrettyHtmlFromDiff = function (diffInput, config) {
|
||||
var diffJson = diffParser.generateDiffJson(diffInput);
|
||||
|
||||
var configOrEmpty = config || {};
|
||||
return htmlPrinter.generateLineByLineJsonHtml(diffJson, configOrEmpty);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -17,19 +17,24 @@
|
|||
LineByLinePrinter.prototype.generateLineByLineJsonHtml = function (diffFiles, config) {
|
||||
return "<div class=\"d2h-wrapper\">\n" +
|
||||
diffFiles.map(function (file) {
|
||||
|
||||
var diffs;
|
||||
if (file.blocks.length) diffs = generateFileHtml(file, config);
|
||||
else diffs = generateEmptyDiff();
|
||||
|
||||
return "<div class=\"d2h-file-wrapper\" data-lang=\"" + file.language + "\">\n" +
|
||||
" <div class=\"d2h-file-header\">\n" +
|
||||
" <div class=\"d2h-file-stats\">\n" +
|
||||
" <span class=\"d2h-lines-added\">+" + file.addedLines + "</span>\n" +
|
||||
" <span class=\"d2h-lines-deleted\">-" + file.deletedLines + "</span>\n" +
|
||||
" </div>\n" +
|
||||
" <div class=\"d2h-file-name\">" + printerUtils.getDiffName(file.oldName, file.newName) + "</div>\n" +
|
||||
" <div class=\"d2h-file-name\">" + printerUtils.getDiffName(file) + "</div>\n" +
|
||||
" </div>\n" +
|
||||
" <div class=\"d2h-file-diff\">\n" +
|
||||
" <div class=\"d2h-code-wrapper\">\n" +
|
||||
" <table class=\"d2h-diff-table\">\n" +
|
||||
" <tbody class=\"d2h-diff-tbody\">\n" +
|
||||
" " + generateFileHtml(file, config) +
|
||||
" " + diffs +
|
||||
" </tbody>\n" +
|
||||
" </table>\n" +
|
||||
" </div>\n" +
|
||||
|
|
@ -76,7 +81,7 @@
|
|||
oldEscapedLine = utils.escape(oldLine.content);
|
||||
newEscapedLine = utils.escape(newLine.content);
|
||||
|
||||
config.isTripleDiff = file.isTripleDiff;
|
||||
config.isCombined = file.isCombined;
|
||||
var diff = printerUtils.diffHighlight(oldEscapedLine, newEscapedLine, config);
|
||||
|
||||
processedOldLines += generateLineHtml(oldLine.type, oldLine.oldNumber, oldLine.newNumber, diff.o);
|
||||
|
|
@ -85,17 +90,7 @@
|
|||
|
||||
lines += processedOldLines + processedNewLines;
|
||||
} else {
|
||||
for (j = 0; j < oldLines.length; j++) {
|
||||
oldLine = oldLines[j];
|
||||
oldEscapedLine = utils.escape(oldLine.content);
|
||||
lines += generateLineHtml(oldLine.type, oldLine.oldNumber, oldLine.newNumber, oldEscapedLine);
|
||||
}
|
||||
|
||||
for (j = 0; j < newLines.length; j++) {
|
||||
newLine = newLines[j];
|
||||
newEscapedLine = utils.escape(newLine.content);
|
||||
lines += generateLineHtml(newLine.type, newLine.oldNumber, newLine.newNumber, newEscapedLine);
|
||||
}
|
||||
lines += processLines(oldLines, newLines);
|
||||
}
|
||||
|
||||
oldLines = [];
|
||||
|
|
@ -106,10 +101,30 @@
|
|||
}
|
||||
}
|
||||
|
||||
lines += processLines(oldLines, newLines);
|
||||
|
||||
return lines;
|
||||
}).join("\n");
|
||||
}
|
||||
|
||||
function processLines(oldLines, newLines) {
|
||||
var lines = "";
|
||||
|
||||
for (j = 0; j < oldLines.length; j++) {
|
||||
var oldLine = oldLines[j];
|
||||
var oldEscapedLine = utils.escape(oldLine.content);
|
||||
lines += generateLineHtml(oldLine.type, oldLine.oldNumber, oldLine.newNumber, oldEscapedLine);
|
||||
}
|
||||
|
||||
for (j = 0; j < newLines.length; j++) {
|
||||
var newLine = newLines[j];
|
||||
var newEscapedLine = utils.escape(newLine.content);
|
||||
lines += generateLineHtml(newLine.type, newLine.oldNumber, newLine.newNumber, newEscapedLine);
|
||||
}
|
||||
|
||||
return lines;
|
||||
}
|
||||
|
||||
function generateLineHtml(type, oldNumber, newNumber, content) {
|
||||
return "<tr>\n" +
|
||||
" <td class=\"d2h-code-linenumber " + type + "\">" +
|
||||
|
|
@ -122,6 +137,16 @@
|
|||
"</tr>\n";
|
||||
}
|
||||
|
||||
function generateEmptyDiff() {
|
||||
return "<tr>\n" +
|
||||
" <td class=\"" + diffParser.LINE_TYPE.INFO + "\">" +
|
||||
" <div class=\"d2h-code-line " + diffParser.LINE_TYPE.INFO + "\">" +
|
||||
"File without changes" +
|
||||
" </div>" +
|
||||
" </td>\n" +
|
||||
"</tr>\n";
|
||||
}
|
||||
|
||||
if (typeof module !== 'undefined' && module.exports) {
|
||||
module.exports.LineByLinePrinter = new LineByLinePrinter();
|
||||
} else if (typeof global.LineByLinePrinter === 'undefined') {
|
||||
|
|
|
|||
|
|
@ -13,10 +13,15 @@
|
|||
function PrinterUtils() {
|
||||
}
|
||||
|
||||
PrinterUtils.prototype.getDiffName = function (oldFilename, newFilename) {
|
||||
if (oldFilename && newFilename && oldFilename !== newFilename) {
|
||||
PrinterUtils.prototype.getDiffName = function (file) {
|
||||
var oldFilename = file.oldName;
|
||||
var newFilename = file.newName;
|
||||
|
||||
if (oldFilename && newFilename
|
||||
&& oldFilename !== newFilename
|
||||
&& !isDeletedName(newFilename)) {
|
||||
return oldFilename + " -> " + newFilename;
|
||||
} else if (newFilename) {
|
||||
} else if (newFilename && !isDeletedName(newFilename)) {
|
||||
return newFilename;
|
||||
} else if (oldFilename) {
|
||||
return oldFilename;
|
||||
|
|
@ -30,7 +35,7 @@
|
|||
|
||||
var prefixSize = 1;
|
||||
|
||||
if (config.isTripleDiff) prefixSize = 2;
|
||||
if (config.isCombined) prefixSize = 2;
|
||||
|
||||
lineStart1 = diffLine1.substr(0, prefixSize);
|
||||
lineStart2 = diffLine2.substr(0, prefixSize);
|
||||
|
|
@ -60,6 +65,10 @@
|
|||
}
|
||||
};
|
||||
|
||||
function isDeletedName(name) {
|
||||
return name === "dev/null";
|
||||
}
|
||||
|
||||
function removeIns(line) {
|
||||
return line.replace(/(<ins>((.|\n)*?)<\/ins>)/g, "");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,10 @@
|
|||
SideBySidePrinter.prototype.generateSideBySideJsonHtml = function (diffFiles, config) {
|
||||
return "<div class=\"d2h-wrapper\">\n" +
|
||||
diffFiles.map(function (file) {
|
||||
var diffs = generateSideBySideFileHtml(file, config);
|
||||
|
||||
var diffs;
|
||||
if (file.blocks.length) diffs = generateSideBySideFileHtml(file, config);
|
||||
else diffs = generateEmptyDiff();
|
||||
|
||||
return "<div class=\"d2h-file-wrapper\" data-lang=\"" + file.language + "\">\n" +
|
||||
" <div class=\"d2h-file-header\">\n" +
|
||||
|
|
@ -25,7 +28,7 @@
|
|||
" <span class=\"d2h-lines-added\">+" + file.addedLines + "</span>\n" +
|
||||
" <span class=\"d2h-lines-deleted\">-" + file.deletedLines + "</span>\n" +
|
||||
" </div>\n" +
|
||||
" <div class=\"d2h-file-name\">" + printerUtils.getDiffName(file.oldName, file.newName) + "</div>\n" +
|
||||
" <div class=\"d2h-file-name\">" + printerUtils.getDiffName(file) + "</div>\n" +
|
||||
" </div>\n" +
|
||||
" <div class=\"d2h-files-diff\">\n" +
|
||||
" <div class=\"d2h-file-side-diff\">\n" +
|
||||
|
|
@ -74,6 +77,7 @@
|
|||
"</tr>\n";
|
||||
|
||||
var oldLines = [], newLines = [];
|
||||
var tmpHtml = "";
|
||||
|
||||
for (var i = 0; i < block.lines.length; i++) {
|
||||
var line = block.lines[i];
|
||||
|
|
@ -101,7 +105,7 @@
|
|||
oldEscapedLine = utils.escape(oldLine.content);
|
||||
newEscapedLine = utils.escape(newLine.content);
|
||||
|
||||
config.isTripleDiff = file.isTripleDiff;
|
||||
config.isCombined = file.isCombined;
|
||||
|
||||
var diff = printerUtils.diffHighlight(oldEscapedLine, newEscapedLine, config);
|
||||
|
||||
|
|
@ -109,24 +113,9 @@
|
|||
fileHtml.right += generateSingleLineHtml(newLine.type, newLine.newNumber, diff.n);
|
||||
}
|
||||
} else {
|
||||
var maxLinesNumber = Math.max(oldLines.length, newLines.length);
|
||||
for (j = 0; j < maxLinesNumber; j++) {
|
||||
oldLine = oldLines[j];
|
||||
newLine = newLines[j];
|
||||
|
||||
if (oldLine && newLine) {
|
||||
fileHtml.left += generateSingleLineHtml(oldLine.type, oldLine.oldNumber, utils.escape(oldLine.content));
|
||||
fileHtml.right += generateSingleLineHtml(newLine.type, newLine.newNumber, utils.escape(newLine.content));
|
||||
} else if (oldLine) {
|
||||
fileHtml.left += generateSingleLineHtml(oldLine.type, oldLine.oldNumber, utils.escape(oldLine.content));
|
||||
fileHtml.right += generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, "", "", "");
|
||||
} else if (newLine) {
|
||||
fileHtml.left += generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, "", "", "");
|
||||
fileHtml.right += generateSingleLineHtml(newLine.type, newLine.newNumber, utils.escape(newLine.content));
|
||||
} else {
|
||||
console.error("How did it get here?");
|
||||
}
|
||||
}
|
||||
tmpHtml = processLines(oldLines, newLines);
|
||||
fileHtml.left += tmpHtml.left;
|
||||
fileHtml.right += tmpHtml.right;
|
||||
}
|
||||
|
||||
oldLines = [];
|
||||
|
|
@ -134,11 +123,42 @@
|
|||
i--;
|
||||
}
|
||||
}
|
||||
|
||||
tmpHtml = processLines(oldLines, newLines);
|
||||
fileHtml.left += tmpHtml.left;
|
||||
fileHtml.right += tmpHtml.right;
|
||||
});
|
||||
|
||||
return fileHtml;
|
||||
}
|
||||
|
||||
function processLines(oldLines, newLines) {
|
||||
var fileHtml = {};
|
||||
fileHtml.left = "";
|
||||
fileHtml.right = "";
|
||||
|
||||
var maxLinesNumber = Math.max(oldLines.length, newLines.length);
|
||||
for (j = 0; j < maxLinesNumber; j++) {
|
||||
var oldLine = oldLines[j];
|
||||
var newLine = newLines[j];
|
||||
|
||||
if (oldLine && newLine) {
|
||||
fileHtml.left += generateSingleLineHtml(oldLine.type, oldLine.oldNumber, utils.escape(oldLine.content));
|
||||
fileHtml.right += generateSingleLineHtml(newLine.type, newLine.newNumber, utils.escape(newLine.content));
|
||||
} else if (oldLine) {
|
||||
fileHtml.left += generateSingleLineHtml(oldLine.type, oldLine.oldNumber, utils.escape(oldLine.content));
|
||||
fileHtml.right += generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, "", "", "");
|
||||
} else if (newLine) {
|
||||
fileHtml.left += generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, "", "", "");
|
||||
fileHtml.right += generateSingleLineHtml(newLine.type, newLine.newNumber, utils.escape(newLine.content));
|
||||
} else {
|
||||
console.error("How did it get here?");
|
||||
}
|
||||
}
|
||||
|
||||
return fileHtml;
|
||||
}
|
||||
|
||||
function generateSingleLineHtml(type, number, content) {
|
||||
return "<tr>\n" +
|
||||
" <td class=\"d2h-code-side-linenumber " + type + "\">" + number + "</td>\n" +
|
||||
|
|
@ -148,6 +168,21 @@
|
|||
" </tr>\n";
|
||||
}
|
||||
|
||||
function generateEmptyDiff() {
|
||||
var fileHtml = {};
|
||||
fileHtml.right = "";
|
||||
|
||||
fileHtml.left = "<tr>\n" +
|
||||
" <td class=\"" + diffParser.LINE_TYPE.INFO + "\">" +
|
||||
" <div class=\"d2h-code-side-line " + diffParser.LINE_TYPE.INFO + "\">" +
|
||||
"File without changes" +
|
||||
" </div>" +
|
||||
" </td>\n" +
|
||||
"</tr>\n";
|
||||
|
||||
return fileHtml;
|
||||
}
|
||||
|
||||
if (typeof module !== 'undefined' && module.exports) {
|
||||
module.exports.SideBySidePrinter = new SideBySidePrinter();
|
||||
} else if (typeof global.SideBySidePrinter === 'undefined') {
|
||||
|
|
|
|||
Loading…
Reference in a new issue