@broadcom/endevor-for-zowe-cli
Version:
Endevor Plug-in for Zowe CLI
186 lines • 18.1 kB
JavaScript
;
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.MergeUtils = void 0;
const fs = require("fs");
const Diff3 = require("node-diff3");
const __1 = require("..");
const HashUtils_1 = require("./HashUtils");
const lodash_1 = require("lodash");
class MergeUtils {
static perform2WayMerge(mine, theirs, output, mineDescription, theirsDescription, encoding, endOfLine) {
const mineString = mine.toString(encoding);
const theirsString = theirs.toString(encoding);
const mergeResult = this.MergeStringArrays2Way(mineString.split(endOfLine), theirsString.split(endOfLine), mineDescription, theirsDescription);
fs.writeFileSync(output, mergeResult.result.join(endOfLine), { encoding: encoding });
return mergeResult.conflict;
}
static perform3WayMerge(root, mine, theirs, output, mineDescription, theirsDescription, encoding, endOfLine, rootDescription) {
const rootString = root.toString(encoding);
const mineString = mine.toString(encoding);
const theirsString = theirs.toString(encoding);
const mergeResult = this.MergeStringArrays3Way(mineString.split(endOfLine), theirsString.split(endOfLine), rootString.split(endOfLine), mineDescription, theirsDescription, rootDescription);
const mergedContent = mergeResult.result.join(endOfLine);
fs.writeFileSync(output, mergedContent, { encoding: encoding });
return mergeResult.conflict;
}
static checkFileForMergeNotation(file, encoding) {
const fileContent = fs.readFileSync(file).toString(encoding);
let found = false;
fileContent.split(/\r?\n/).forEach((line) => {
if (line.startsWith(this.MINE_MARKUP) || line.startsWith(this.THEIR_MARKUP)) {
found = true;
}
});
return found;
}
static markElementAsMerged(element) {
return __awaiter(this, void 0, void 0, function* () {
const localFileSha1 = yield HashUtils_1.HashUtils.getFileHash(element.localFile);
if (localFileSha1 == element.localFileVersion.sha1)
element.localStatus = __1.ElementVersionStatus.INSYNC;
else
element.localStatus = __1.ElementVersionStatus.CHANGED;
element.mergeElmVersion = (0, lodash_1.cloneDeep)(__1.WorkspaceUtils.EmptyWorkspaceElementVersion);
element.mergeStatus = __1.ElementVersionStatus.MISSING;
});
}
static toTrimmedArray(input) {
const array = input.map((line) => {
return line.trimEnd();
});
return array;
}
static MergeStringArrays3Way(mine, theirs, root, mineDescription, theirsDescription, rootDescription) {
const mineTrimmed = this.toTrimmedArray(mine);
const theirsTrimmed = this.toTrimmedArray(theirs);
const rootTrimmed = this.toTrimmedArray(root);
let mineIndex = 0;
let rootIndex = 0;
let theirsIndex = 0;
const regions = Diff3.diff3MergeRegions(mineTrimmed, rootTrimmed, theirsTrimmed);
const mergeResult = { conflict: false, result: [] };
regions.forEach((region) => {
if (region.stable) {
mineIndex = region.bufferStart;
theirsIndex = region.bufferStart;
rootIndex = region.bufferStart;
region.bufferContent.forEach((line) => {
if (line == mineTrimmed[mineIndex]) {
mergeResult.result.push(mine[mineIndex]);
}
else if (line == theirsTrimmed[theirsIndex]) {
mergeResult.result.push(theirs[theirsIndex]);
}
else {
mergeResult.result.push(line);
}
mineIndex++;
theirsIndex++;
rootIndex++;
});
}
else {
mineIndex = region.aStart;
theirsIndex = region.bStart;
rootIndex = region.oStart;
let inConflict = false;
if (region.aLength == region.bLength) {
for (let i = 0; i < region.aLength; i++) {
if (region.aContent[i] != region.bContent[i]) {
inConflict = true;
}
}
}
else {
inConflict = true;
}
if (inConflict) {
mergeResult.result.push(`${this.MINE_MARKUP} ${mineDescription}`);
region.aContent.forEach(() => {
mergeResult.result.push(mine[mineIndex]);
mineIndex++;
});
if (rootDescription) {
mergeResult.result.push(`${this.ROOT_MARKUP} ${rootDescription}`);
region.oContent.forEach(() => {
mergeResult.result.push(root[rootIndex]);
rootIndex++;
});
}
mergeResult.result.push(this.SEPARATOR);
region.bContent.forEach(() => {
mergeResult.result.push(theirs[theirsIndex]);
theirsIndex++;
});
mergeResult.result.push(`${this.THEIR_MARKUP} ${theirsDescription}`);
mergeResult.conflict = true;
}
else {
region.aContent.forEach(() => {
mergeResult.result.push(mine[mineIndex]);
mineIndex++;
theirsIndex++;
rootIndex++;
});
}
}
});
return mergeResult;
}
static MergeStringArrays2Way(mine, theirs, mineDescription, theirsDescription) {
const mineTrimmed = this.toTrimmedArray(mine);
const theirsTrimmed = this.toTrimmedArray(theirs);
let mineIndex = 0;
let theirsIndex = 0;
const diffResults = Diff3.diffPatch(mineTrimmed, theirsTrimmed);
const mergeResult = { conflict: false, result: [] };
if (diffResults.length == 0) {
mine.forEach((line) => mergeResult.result.push(line.toString()));
}
else {
diffResults.forEach((diffResult) => {
while (diffResult.buffer1.offset > mineIndex) {
mergeResult.result.push(mine[mineIndex]);
mineIndex++;
theirsIndex++;
}
mergeResult.result.push(`${this.MINE_MARKUP} ${mineDescription}`);
diffResult.buffer1.chunk.forEach(() => {
mergeResult.result.push(mine[mineIndex]);
mineIndex++;
});
mergeResult.result.push(this.SEPARATOR);
diffResult.buffer2.chunk.forEach(() => {
mergeResult.result.push(theirs[theirsIndex]);
theirsIndex++;
});
mergeResult.result.push(`${this.THEIR_MARKUP} ${theirsDescription}`);
mergeResult.conflict = true;
});
while (mineIndex < mine.length) {
mergeResult.result.push(mine[mineIndex]);
mineIndex++;
theirsIndex++;
}
}
return mergeResult;
}
static getMergeCommand(localFile) {
return `zowe endevor confirm resolution '${localFile}'`;
}
}
exports.MergeUtils = MergeUtils;
MergeUtils.MINE_MARKUP = "<<<<<<< LOCAL FILE";
MergeUtils.ROOT_MARKUP = "||||||| COMMON BASE";
MergeUtils.SEPARATOR = "=======";
MergeUtils.THEIR_MARKUP = ">>>>>>> ENDEVOR ELEMENT";
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"MergeUtils.js","sourceRoot":"","sources":["../../../src/api/workspace/MergeUtils.ts"],"names":[],"mappings":"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"}