public void generateTextDiff(RandomAccessFile left, RandomAccessFile right, String encoding, Writer output) throws IOException { QSequenceLineRAData leftData = null, rightData = null; if (left == null) { leftData = new QSequenceLineRAByteData(new byte[0]); } else { leftData = new QSequenceLineRAFileData(left); } if (right == null) { rightData = new QSequenceLineRAByteData(new byte[0]); } else { rightData = new QSequenceLineRAFileData(right); } generateTextDiff(leftData, rightData, encoding, output); }
public void generateTextDiff(RandomAccessFile left, RandomAccessFile right, OutputStream output) throws IOException { QSequenceLineRAData leftData = null, rightData = null; if (left == null) { leftData = new QSequenceLineRAByteData(new byte[0]); } else { leftData = new QSequenceLineRAFileData(left); } if (right == null) { rightData = new QSequenceLineRAByteData(new byte[0]); } else { rightData = new QSequenceLineRAFileData(right); } generateTextDiff(leftData, rightData, output); }
public void generateTextDiff(RandomAccessFile left, RandomAccessFile right, String encoding, Writer output) throws IOException { QSequenceLineRAData leftData = null, rightData = null; if (left == null) { leftData = new QSequenceLineRAByteData(new byte[0]); } else { leftData = new QSequenceLineRAFileData(left); } if (right == null) { rightData = new QSequenceLineRAByteData(new byte[0]); } else { rightData = new QSequenceLineRAFileData(right); } generateTextDiff(leftData, rightData, encoding, output); }
public void generateTextDiff(RandomAccessFile left, RandomAccessFile right, String encoding, Writer output) throws IOException { QSequenceLineRAData leftData = null, rightData = null; if (left == null) { leftData = new QSequenceLineRAByteData(new byte[0]); } else { leftData = new QSequenceLineRAFileData(left); } if (right == null) { rightData = new QSequenceLineRAByteData(new byte[0]); } else { rightData = new QSequenceLineRAFileData(right); } generateTextDiff(leftData, rightData, encoding, output); }
baseIS = new RandomAccessFile(baseFile, "r"); QSequenceLineRAData baseData = new QSequenceLineRAFileData(baseIS); QSequenceLineRAData localData = new QSequenceLineRAFileData(localIS); QSequenceLineRAData latestData = new QSequenceLineRAFileData(latestIS); mergeResult = merger.merge(baseData, localData, latestData, options, result); } catch (IOException e) {
private void showConflictedChunks(SVNMergeFileSet files) throws SVNException { byte[] conflictStartMarker = "<<<<<<< MINE (select with 'mc')".getBytes(); byte[] conflictSeparator = "=======".getBytes(); byte[] conflictEndMarker = ">>>>>>> THEIRS (select with 'tc')".getBytes(); byte[] conflictOriginalMarker = "||||||| ORIGINAL".getBytes(); SVNDiffOptions options = new SVNDiffOptions(false, false, true); FSMergerBySequence merger = new FSMergerBySequence(conflictStartMarker, conflictSeparator, conflictEndMarker, conflictOriginalMarker); RandomAccessFile localIS = null; RandomAccessFile latestIS = null; RandomAccessFile baseIS = null; try { localIS = new RandomAccessFile(files.getWCFile(), "r"); latestIS = new RandomAccessFile(files.getRepositoryFile(), "r"); baseIS = new RandomAccessFile(files.getBaseFile(), "r"); QSequenceLineRAData baseData = new QSequenceLineRAFileData(baseIS); QSequenceLineRAData localData = new QSequenceLineRAFileData(localIS); QSequenceLineRAData latestData = new QSequenceLineRAFileData(latestIS); merger.merge(baseData, localData, latestData, options, mySVNEnvironment.getOut(), SVNDiffConflictChoiceStyle.CHOOSE_ONLY_CONFLICTS); } catch (IOException e) { SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.IO_ERROR, e.getLocalizedMessage()); SVNErrorManager.error(err, e, SVNLogType.WC); } finally { SVNFileUtil.closeFile(localIS); SVNFileUtil.closeFile(baseIS); SVNFileUtil.closeFile(latestIS); } }
private void showConflictedChunks(SVNMergeFileSet files) throws SVNException { byte[] conflictStartMarker = "<<<<<<< MINE (select with 'mc')".getBytes(); byte[] conflictSeparator = "=======".getBytes(); byte[] conflictEndMarker = ">>>>>>> THEIRS (select with 'tc')".getBytes(); byte[] conflictOriginalMarker = "||||||| ORIGINAL".getBytes(); SVNDiffOptions options = new SVNDiffOptions(false, false, true); FSMergerBySequence merger = new FSMergerBySequence(conflictStartMarker, conflictSeparator, conflictEndMarker, conflictOriginalMarker); RandomAccessFile localIS = null; RandomAccessFile latestIS = null; RandomAccessFile baseIS = null; try { localIS = new RandomAccessFile(files.getWCFile(), "r"); latestIS = new RandomAccessFile(files.getRepositoryFile(), "r"); baseIS = new RandomAccessFile(files.getBaseFile(), "r"); QSequenceLineRAData baseData = new QSequenceLineRAFileData(baseIS); QSequenceLineRAData localData = new QSequenceLineRAFileData(localIS); QSequenceLineRAData latestData = new QSequenceLineRAFileData(latestIS); merger.merge(baseData, localData, latestData, options, mySVNEnvironment.getOut(), SVNDiffConflictChoiceStyle.CHOOSE_ONLY_CONFLICTS); } catch (IOException e) { SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.IO_ERROR, e.getLocalizedMessage()); SVNErrorManager.error(err, e, SVNLogType.WC); } finally { SVNFileUtil.closeFile(localIS); SVNFileUtil.closeFile(baseIS); SVNFileUtil.closeFile(latestIS); } }
baseIS = new RandomAccessFile(leftAbspath, "r"); QSequenceLineRAData baseData = new QSequenceLineRAFileData(baseIS); QSequenceLineRAData localData = new QSequenceLineRAFileData(localIS); QSequenceLineRAData latestData = new QSequenceLineRAFileData(latestIS); mergeResult = merger.merge(baseData, localData, latestData, options, result, style); } catch (IOException e) {
baseIS = new RandomAccessFile(baseFile, "r"); QSequenceLineRAData baseData = new QSequenceLineRAFileData(baseIS); QSequenceLineRAData localData = new QSequenceLineRAFileData(localIS); QSequenceLineRAData latestData = new QSequenceLineRAFileData(latestIS); mergeResult = merger.merge(baseData, localData, latestData, options, result); } catch (IOException e) {
baseIS = new RandomAccessFile(baseFile, "r"); QSequenceLineRAData baseData = new QSequenceLineRAFileData(baseIS); QSequenceLineRAData localData = new QSequenceLineRAFileData(localIS); QSequenceLineRAData latestData = new QSequenceLineRAFileData(latestIS); mergeResult = merger.merge(baseData, localData, latestData, options, result, getDiffConflictStyle()); } catch (IOException e) {
baseIS = new RandomAccessFile(baseFile, "r"); QSequenceLineRAData baseData = new QSequenceLineRAFileData(baseIS); QSequenceLineRAData localData = new QSequenceLineRAFileData(localIS); QSequenceLineRAData latestData = new QSequenceLineRAFileData(latestIS); mergeResult = merger.merge(baseData, localData, latestData, options, result, getDiffConflictStyle()); } catch (IOException e) {
latestIS = new RandomAccessFile(rightAbspath, "r"); baseIS = new RandomAccessFile(leftAbspath, "r"); QSequenceLineRAData baseData = new QSequenceLineRAFileData(baseIS); QSequenceLineRAData localData = new QSequenceLineRAFileData(localIS); QSequenceLineRAData latestData = new QSequenceLineRAFileData(latestIS); merger.merge(baseData, localData, latestData, options, chosenStream, style); } catch (IOException e) {
int newStart = 0; final QSequenceLineResult result = QSequenceLineMedia.createBlocks(new QSequenceLineRAFileData(left), new QSequenceLineRAFileData(right), createSimplifier()); try { List blocksList = result.getBlocks();
right = new RandomAccessFile(currentFile, "r"); final QSequenceLineResult result = QSequenceLineMedia.createBlocks(new QSequenceLineRAFileData(left), new QSequenceLineRAFileData(right), createSimplifier()); try { List blocksList = result.getBlocks();
right = new RandomAccessFile(currentFile, "r"); final QSequenceLineResult result = QSequenceLineMedia.createBlocks(new QSequenceLineRAFileData(left), new QSequenceLineRAFileData(right), createSimplifier()); try { List blocksList = result.getBlocks();
right = new RandomAccessFile(currentFile, "r"); final QSequenceLineResult result = QSequenceLineMedia.createBlocks(new QSequenceLineRAFileData(left), new QSequenceLineRAFileData(right), createSimplifier()); try { List blocksList = result.getBlocks();
outputStream = new FileOutputStream(uniqueFile); outputStream = new BufferedOutputStream(outputStream); merger.merge(new QSequenceLineRAFileData(leftRAFile), new QSequenceLineRAFileData(detranslatedRAFile), new QSequenceLineRAFileData(rightRAFile), null, outputStream, choice == SVNConflictChoice.THEIRS_CONFLICT ? SVNDiffConflictChoiceStyle.CHOOSE_LATEST : SVNDiffConflictChoiceStyle.CHOOSE_MODIFIED); } catch (IOException e) {
localIS = new RandomAccessFile(conflictWorking, "r"); latestIS = new RandomAccessFile(conflictNew, "r"); QSequenceLineRAData baseData = new QSequenceLineRAFileData(baseIS); QSequenceLineRAData localData = new QSequenceLineRAFileData(localIS); QSequenceLineRAData latestData = new QSequenceLineRAFileData(latestIS); merger.merge(baseData, localData, latestData, null, result, style); } catch (IOException e) {