增加了git功能，但是还未完善
This commit is contained in:
xubing
28
node_modules/diff3/.npmignore
generated
vendored
Normal file
28
node_modules/diff3/.npmignore
generated
vendored
Normal file
@@ -0,0 +1,28 @@
|
||||
# Logs
|
||||
logs
|
||||
*.log
|
||||
npm-debug.log*
|
||||
|
||||
# Runtime data
|
||||
pids
|
||||
*.pid
|
||||
*.seed
|
||||
|
||||
# Directory for instrumented libs generated by jscoverage/JSCover
|
||||
lib-cov
|
||||
|
||||
# Coverage directory used by tools like istanbul
|
||||
coverage
|
||||
|
||||
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
|
||||
.grunt
|
||||
|
||||
# node-waf configuration
|
||||
.lock-wscript
|
||||
|
||||
# Compiled binary addons (http://nodejs.org/api/addons.html)
|
||||
build/Release
|
||||
|
||||
# Dependency directory
|
||||
# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
|
||||
node_modules
|
||||
28
node_modules/diff3/README.md
generated
vendored
Normal file
28
node_modules/diff3/README.md
generated
vendored
Normal file
@@ -0,0 +1,28 @@
|
||||
# diff3
|
||||
|
||||
## Usage
|
||||
```js
|
||||
var diff3Merge = require('diff3');
|
||||
var a = ['a', 'text', 'file'];
|
||||
var o = ['a', 'test', 'file'];
|
||||
var b = ['a', 'toasty', 'filtered', 'file'];
|
||||
var diff3 = diff3Merge(a, o, b);
|
||||
```
|
||||
|
||||
## Output
|
||||
```JSON
|
||||
[{
|
||||
"ok": ["a"]
|
||||
}, {
|
||||
"conflict": {
|
||||
"a": ["text"],
|
||||
"aIndex": 1,
|
||||
"o": ["test"],
|
||||
"oIndex": 1,
|
||||
"b": ["toasty", "filtered"],
|
||||
"bIndex": 1
|
||||
}
|
||||
}, {
|
||||
"ok": ["file"]
|
||||
}]
|
||||
```
|
||||
271
node_modules/diff3/diff3.js
generated
vendored
Normal file
271
node_modules/diff3/diff3.js
generated
vendored
Normal file
@@ -0,0 +1,271 @@
|
||||
// Copyright (c) 2006, 2008 Tony Garnock-Jones <tonyg@lshift.net>
|
||||
// Copyright (c) 2006, 2008 LShift Ltd. <query@lshift.net>
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person
|
||||
// obtaining a copy of this software and associated documentation files
|
||||
// (the "Software"), to deal in the Software without restriction,
|
||||
// including without limitation the rights to use, copy, modify, merge,
|
||||
// publish, distribute, sublicense, and/or sell copies of the Software,
|
||||
// and to permit persons to whom the Software is furnished to do so,
|
||||
// subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
||||
// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
||||
// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
// SOFTWARE.
|
||||
|
||||
var onp = require('./onp');
|
||||
|
||||
function longestCommonSubsequence(file1, file2) {
|
||||
var diff = new onp(file1, file2);
|
||||
diff.compose();
|
||||
var ses = diff.getses();
|
||||
|
||||
var root;
|
||||
var prev;
|
||||
var file1RevIdx = file1.length - 1,
|
||||
file2RevIdx = file2.length - 1;
|
||||
for (var i = ses.length - 1; i >= 0; --i) {
|
||||
if (ses[i].t === diff.SES_COMMON) {
|
||||
if (prev) {
|
||||
prev.chain = {
|
||||
file1index: file1RevIdx,
|
||||
file2index: file2RevIdx,
|
||||
chain: null
|
||||
};
|
||||
prev = prev.chain;
|
||||
} else {
|
||||
root = {
|
||||
file1index: file1RevIdx,
|
||||
file2index: file2RevIdx,
|
||||
chain: null
|
||||
};
|
||||
prev = root;
|
||||
}
|
||||
file1RevIdx--;
|
||||
file2RevIdx--;
|
||||
} else if (ses[i].t === diff.SES_DELETE) {
|
||||
file1RevIdx--;
|
||||
} else if (ses[i].t === diff.SES_ADD) {
|
||||
file2RevIdx--;
|
||||
}
|
||||
}
|
||||
|
||||
var tail = {
|
||||
file1index: -1,
|
||||
file2index: -1,
|
||||
chain: null
|
||||
};
|
||||
|
||||
if (!prev) {
|
||||
return tail;
|
||||
}
|
||||
|
||||
prev.chain = tail;
|
||||
|
||||
return root;
|
||||
}
|
||||
|
||||
function diffIndices(file1, file2) {
|
||||
// We apply the LCS to give a simple representation of the
|
||||
// offsets and lengths of mismatched chunks in the input
|
||||
// files. This is used by diff3_merge_indices below.
|
||||
|
||||
var result = [];
|
||||
var tail1 = file1.length;
|
||||
var tail2 = file2.length;
|
||||
|
||||
for (var candidate = longestCommonSubsequence(file1, file2); candidate !== null; candidate = candidate.chain) {
|
||||
var mismatchLength1 = tail1 - candidate.file1index - 1;
|
||||
var mismatchLength2 = tail2 - candidate.file2index - 1;
|
||||
tail1 = candidate.file1index;
|
||||
tail2 = candidate.file2index;
|
||||
|
||||
if (mismatchLength1 || mismatchLength2) {
|
||||
result.push({
|
||||
file1: [tail1 + 1, mismatchLength1],
|
||||
file2: [tail2 + 1, mismatchLength2]
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
result.reverse();
|
||||
return result;
|
||||
}
|
||||
|
||||
function diff3MergeIndices(a, o, b) {
|
||||
// Given three files, A, O, and B, where both A and B are
|
||||
// independently derived from O, returns a fairly complicated
|
||||
// internal representation of merge decisions it's taken. The
|
||||
// interested reader may wish to consult
|
||||
//
|
||||
// Sanjeev Khanna, Keshav Kunal, and Benjamin C. Pierce. "A
|
||||
// Formal Investigation of Diff3." In Arvind and Prasad,
|
||||
// editors, Foundations of Software Technology and Theoretical
|
||||
// Computer Science (FSTTCS), December 2007.
|
||||
//
|
||||
// (http://www.cis.upenn.edu/~bcpierce/papers/diff3-short.pdf)
|
||||
var i;
|
||||
|
||||
var m1 = diffIndices(o, a);
|
||||
var m2 = diffIndices(o, b);
|
||||
|
||||
var hunks = [];
|
||||
|
||||
function addHunk(h, side) {
|
||||
hunks.push([h.file1[0], side, h.file1[1], h.file2[0], h.file2[1]]);
|
||||
}
|
||||
for (i = 0; i < m1.length; i++) {
|
||||
addHunk(m1[i], 0);
|
||||
}
|
||||
for (i = 0; i < m2.length; i++) {
|
||||
addHunk(m2[i], 2);
|
||||
}
|
||||
hunks.sort(function(x, y) {
|
||||
return x[0] - y[0]
|
||||
});
|
||||
|
||||
var result = [];
|
||||
var commonOffset = 0;
|
||||
|
||||
function copyCommon(targetOffset) {
|
||||
if (targetOffset > commonOffset) {
|
||||
result.push([1, commonOffset, targetOffset - commonOffset]);
|
||||
commonOffset = targetOffset;
|
||||
}
|
||||
}
|
||||
|
||||
for (var hunkIndex = 0; hunkIndex < hunks.length; hunkIndex++) {
|
||||
var firstHunkIndex = hunkIndex;
|
||||
var hunk = hunks[hunkIndex];
|
||||
var regionLhs = hunk[0];
|
||||
var regionRhs = regionLhs + hunk[2];
|
||||
while (hunkIndex < hunks.length - 1) {
|
||||
var maybeOverlapping = hunks[hunkIndex + 1];
|
||||
var maybeLhs = maybeOverlapping[0];
|
||||
if (maybeLhs > regionRhs) break;
|
||||
regionRhs = Math.max(regionRhs, maybeLhs + maybeOverlapping[2]);
|
||||
hunkIndex++;
|
||||
}
|
||||
|
||||
copyCommon(regionLhs);
|
||||
if (firstHunkIndex == hunkIndex) {
|
||||
// The "overlap" was only one hunk long, meaning that
|
||||
// there's no conflict here. Either a and o were the
|
||||
// same, or b and o were the same.
|
||||
if (hunk[4] > 0) {
|
||||
result.push([hunk[1], hunk[3], hunk[4]]);
|
||||
}
|
||||
} else {
|
||||
// A proper conflict. Determine the extents of the
|
||||
// regions involved from a, o and b. Effectively merge
|
||||
// all the hunks on the left into one giant hunk, and
|
||||
// do the same for the right; then, correct for skew
|
||||
// in the regions of o that each side changed, and
|
||||
// report appropriate spans for the three sides.
|
||||
var regions = {
|
||||
0: [a.length, -1, o.length, -1],
|
||||
2: [b.length, -1, o.length, -1]
|
||||
};
|
||||
for (i = firstHunkIndex; i <= hunkIndex; i++) {
|
||||
hunk = hunks[i];
|
||||
var side = hunk[1];
|
||||
var r = regions[side];
|
||||
var oLhs = hunk[0];
|
||||
var oRhs = oLhs + hunk[2];
|
||||
var abLhs = hunk[3];
|
||||
var abRhs = abLhs + hunk[4];
|
||||
r[0] = Math.min(abLhs, r[0]);
|
||||
r[1] = Math.max(abRhs, r[1]);
|
||||
r[2] = Math.min(oLhs, r[2]);
|
||||
r[3] = Math.max(oRhs, r[3]);
|
||||
}
|
||||
var aLhs = regions[0][0] + (regionLhs - regions[0][2]);
|
||||
var aRhs = regions[0][1] + (regionRhs - regions[0][3]);
|
||||
var bLhs = regions[2][0] + (regionLhs - regions[2][2]);
|
||||
var bRhs = regions[2][1] + (regionRhs - regions[2][3]);
|
||||
result.push([-1,
|
||||
aLhs, aRhs - aLhs,
|
||||
regionLhs, regionRhs - regionLhs,
|
||||
bLhs, bRhs - bLhs
|
||||
]);
|
||||
}
|
||||
commonOffset = regionRhs;
|
||||
}
|
||||
|
||||
copyCommon(o.length);
|
||||
return result;
|
||||
}
|
||||
|
||||
function diff3Merge(a, o, b) {
|
||||
// Applies the output of Diff.diff3_merge_indices to actually
|
||||
// construct the merged file; the returned result alternates
|
||||
// between "ok" and "conflict" blocks.
|
||||
|
||||
var result = [];
|
||||
var files = [a, o, b];
|
||||
var indices = diff3MergeIndices(a, o, b);
|
||||
|
||||
var okLines = [];
|
||||
|
||||
function flushOk() {
|
||||
if (okLines.length) {
|
||||
result.push({
|
||||
ok: okLines
|
||||
});
|
||||
}
|
||||
okLines = [];
|
||||
}
|
||||
|
||||
function pushOk(xs) {
|
||||
for (var j = 0; j < xs.length; j++) {
|
||||
okLines.push(xs[j]);
|
||||
}
|
||||
}
|
||||
|
||||
function isTrueConflict(rec) {
|
||||
if (rec[2] != rec[6]) return true;
|
||||
var aoff = rec[1];
|
||||
var boff = rec[5];
|
||||
for (var j = 0; j < rec[2]; j++) {
|
||||
if (a[j + aoff] != b[j + boff]) return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
for (var i = 0; i < indices.length; i++) {
|
||||
var x = indices[i];
|
||||
var side = x[0];
|
||||
if (side == -1) {
|
||||
if (!isTrueConflict(x)) {
|
||||
pushOk(files[0].slice(x[1], x[1] + x[2]));
|
||||
} else {
|
||||
flushOk();
|
||||
result.push({
|
||||
conflict: {
|
||||
a: a.slice(x[1], x[1] + x[2]),
|
||||
aIndex: x[1],
|
||||
o: o.slice(x[3], x[3] + x[4]),
|
||||
oIndex: x[3],
|
||||
b: b.slice(x[5], x[5] + x[6]),
|
||||
bIndex: x[5]
|
||||
}
|
||||
});
|
||||
}
|
||||
} else {
|
||||
pushOk(files[side].slice(x[1], x[1] + x[2]));
|
||||
}
|
||||
}
|
||||
|
||||
flushOk();
|
||||
return result;
|
||||
}
|
||||
|
||||
module.exports = diff3Merge;
|
||||
178
node_modules/diff3/onp.js
generated
vendored
Normal file
178
node_modules/diff3/onp.js
generated
vendored
Normal file
@@ -0,0 +1,178 @@
|
||||
/*
|
||||
* URL: https://github.com/cubicdaiya/onp
|
||||
*
|
||||
* Copyright (c) 2013 Tatsuhiko Kubo <cubicdaiya@gmail.com>
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
/**
|
||||
* The algorithm implemented here is based on "An O(NP) Sequence Comparison Algorithm"
|
||||
* by described by Sun Wu, Udi Manber and Gene Myers
|
||||
*/
|
||||
module.exports = function (a_, b_) {
|
||||
var a = a_,
|
||||
b = b_,
|
||||
m = a.length,
|
||||
n = b.length,
|
||||
reverse = false,
|
||||
ed = null,
|
||||
offset = m + 1,
|
||||
path = [],
|
||||
pathposi = [],
|
||||
ses = [],
|
||||
lcs = "",
|
||||
SES_DELETE = -1,
|
||||
SES_COMMON = 0,
|
||||
SES_ADD = 1;
|
||||
|
||||
var tmp1,
|
||||
tmp2;
|
||||
|
||||
var init = function () {
|
||||
if (m >= n) {
|
||||
tmp1 = a;
|
||||
tmp2 = m;
|
||||
a = b;
|
||||
b = tmp1;
|
||||
m = n;
|
||||
n = tmp2;
|
||||
reverse = true;
|
||||
offset = m + 1;
|
||||
}
|
||||
};
|
||||
|
||||
var P = function (x, y, k) {
|
||||
return {
|
||||
'x' : x,
|
||||
'y' : y,
|
||||
'k' : k,
|
||||
};
|
||||
};
|
||||
|
||||
var seselem = function (elem, t) {
|
||||
return {
|
||||
'elem' : elem,
|
||||
't' : t,
|
||||
};
|
||||
};
|
||||
|
||||
var snake = function (k, p, pp) {
|
||||
var r, x, y;
|
||||
if (p > pp) {
|
||||
r = path[k-1+offset];
|
||||
} else {
|
||||
r = path[k+1+offset];
|
||||
}
|
||||
|
||||
y = Math.max(p, pp);
|
||||
x = y - k;
|
||||
while (x < m && y < n && a[x] === b[y]) {
|
||||
++x;
|
||||
++y;
|
||||
}
|
||||
|
||||
path[k+offset] = pathposi.length;
|
||||
pathposi[pathposi.length] = new P(x, y, r);
|
||||
return y;
|
||||
};
|
||||
|
||||
var recordseq = function (epc) {
|
||||
var x_idx, y_idx, px_idx, py_idx, i;
|
||||
x_idx = y_idx = 1;
|
||||
px_idx = py_idx = 0;
|
||||
for (i=epc.length-1;i>=0;--i) {
|
||||
while(px_idx < epc[i].x || py_idx < epc[i].y) {
|
||||
if (epc[i].y - epc[i].x > py_idx - px_idx) {
|
||||
if (reverse) {
|
||||
ses[ses.length] = new seselem(b[py_idx], SES_DELETE);
|
||||
} else {
|
||||
ses[ses.length] = new seselem(b[py_idx], SES_ADD);
|
||||
}
|
||||
++y_idx;
|
||||
++py_idx;
|
||||
} else if (epc[i].y - epc[i].x < py_idx - px_idx) {
|
||||
if (reverse) {
|
||||
ses[ses.length] = new seselem(a[px_idx], SES_ADD);
|
||||
} else {
|
||||
ses[ses.length] = new seselem(a[px_idx], SES_DELETE);
|
||||
}
|
||||
++x_idx;
|
||||
++px_idx;
|
||||
} else {
|
||||
ses[ses.length] = new seselem(a[px_idx], SES_COMMON);
|
||||
lcs += a[px_idx];
|
||||
++x_idx;
|
||||
++y_idx;
|
||||
++px_idx;
|
||||
++py_idx;
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
init();
|
||||
|
||||
return {
|
||||
SES_DELETE : -1,
|
||||
SES_COMMON : 0,
|
||||
SES_ADD : 1,
|
||||
editdistance : function () {
|
||||
return ed;
|
||||
},
|
||||
getlcs : function () {
|
||||
return lcs;
|
||||
},
|
||||
getses : function () {
|
||||
return ses;
|
||||
},
|
||||
compose : function () {
|
||||
var delta, size, fp, p, r, epc, i, k;
|
||||
delta = n - m;
|
||||
size = m + n + 3;
|
||||
fp = {};
|
||||
for (i=0;i<size;++i) {
|
||||
fp[i] = -1;
|
||||
path[i] = -1;
|
||||
}
|
||||
p = -1;
|
||||
do {
|
||||
++p;
|
||||
for (k=-p;k<=delta-1;++k) {
|
||||
fp[k+offset] = snake(k, fp[k-1+offset]+1, fp[k+1+offset]);
|
||||
}
|
||||
for (k=delta+p;k>=delta+1;--k) {
|
||||
fp[k+offset] = snake(k, fp[k-1+offset]+1, fp[k+1+offset]);
|
||||
}
|
||||
fp[delta+offset] = snake(delta, fp[delta-1+offset]+1, fp[delta+1+offset]);
|
||||
} while (fp[delta+offset] !== n);
|
||||
|
||||
ed = delta + 2 * p;
|
||||
|
||||
r = path[delta+offset];
|
||||
|
||||
epc = [];
|
||||
while (r !== -1) {
|
||||
epc[epc.length] = new P(pathposi[r].x, pathposi[r].y, null);
|
||||
r = pathposi[r].k;
|
||||
}
|
||||
recordseq(epc);
|
||||
}
|
||||
};
|
||||
};
|
||||
23
node_modules/diff3/package.json
generated
vendored
Normal file
23
node_modules/diff3/package.json
generated
vendored
Normal file
@@ -0,0 +1,23 @@
|
||||
{
|
||||
"name": "diff3",
|
||||
"version": "0.0.3",
|
||||
"description": "A diff3 engine for nodejs",
|
||||
"main": "diff3.js",
|
||||
"scripts": {
|
||||
"test": "echo \"Error: no test specified\" && exit 1"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/axosoft/diff3.git"
|
||||
},
|
||||
"keywords": [
|
||||
"diff3",
|
||||
"diff"
|
||||
],
|
||||
"author": "Tyler Wanek",
|
||||
"license": "MIT",
|
||||
"bugs": {
|
||||
"url": "https://github.com/axosoft/diff3/issues"
|
||||
},
|
||||
"homepage": "https://github.com/axosoft/diff3#readme"
|
||||
}
|
||||
Reference in New Issue
Block a user