Package de.regnis.q.sequence

Examples of de.regnis.q.sequence.QSequenceDifferenceBlock

492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
            final QSequenceLineResult result = QSequenceLineMedia.createBlocks(new QSequenceLineRAFileData(left), new QSequenceLineRAFileData(right), createSimplifier());
            try {
                List blocksList = result.getBlocks();
                for(int i = 0; i < blocksList.size(); i++) {
                    QSequenceDifferenceBlock block = (QSequenceDifferenceBlock) blocksList.get(i);
                    if (block.getLeftSize() > 0) {
                        deleteBlameChunk(block.getRightFrom(), block.getLeftSize(), chain);
                    }
                    if (block.getRightSize() > 0) {
                        insertBlameChunk(myCurrentRevision, myCurrentAuthor,
                                         myCurrentDate, myCurrentPath,
                                         block.getRightFrom(), block.getRightSize(), chain);
                    }
                }
            } finally {
                result.close();
            }
View Full Code Here
102
103
104
105
106
107
108
109
110
111
112
113
          latest.forward();
          continue;
        }

        if (local.hasCurrent() && latest.hasCurrent()) {
          final QSequenceDifferenceBlock localStartBlock = local.current();
          final QSequenceDifferenceBlock latestStartBlock = latest.current();
          if (checkConflict(local, latest, localLines, latestLines, baseLines.getLineCount())) {
            baseLineIndex = createConflict(result, localStartBlock, local.current(), latestStartBlock, latest.current(), localLines, latestLines, baseLineIndex, transformedLocalLines);
            local.forward();
            latest.forward();
            conflict = true;
View Full Code Here
157
158
159
160
161
162
163
164
165
166
167
168
    int baseIndex = 0;

    for (;localIndex < localLines.getLineCount();) {
      final int baseTo;
      if (blockList.hasCurrent()) {
        final QSequenceDifferenceBlock block = blockList.current();
        baseTo = block.getLeftFrom() -1;
      }
      else {
        baseTo = Integer.MAX_VALUE;
      }
View Full Code Here
98
99
100
101
102
103
104
105
106
107
108
109
          latest.forward();
          continue;
        }

        if (local.hasCurrent() && latest.hasCurrent()) {
          final QSequenceDifferenceBlock localStartBlock = local.current();
          final QSequenceDifferenceBlock latestStartBlock = latest.current();
          if (checkConflict(local, latest, localLines, latestLines, baseLines.getLineCount())) {
            if (style == SVNDiffConflictChoiceStyle.CHOOSE_LATEST) {
                        baseLineIndex = appendLines(result, latest.current(), latestLines, baseLineIndex, transformedLocalLines);
                            local.forward();
                        latest.forward();
View Full Code Here
166
167
168
169
170
171
172
173
174
175
176
177
    int baseIndex = 0;

    for (;localIndex < localLines.getLineCount();) {
      final int baseTo;
      if (blockList.hasCurrent()) {
        final QSequenceDifferenceBlock block = blockList.current();
        baseTo = block.getLeftFrom() -1;
      }
      else {
        baseTo = Integer.MAX_VALUE;
      }
View Full Code Here
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
            final QSequenceLineResult result = QSequenceLineMedia.createBlocks(new QSequenceLineRAFileData(left), new QSequenceLineRAFileData(right), createSimplifier());
            try {
                List blocksList = result.getBlocks();
                for(int i = 0; i < blocksList.size(); i++) {
                    QSequenceDifferenceBlock block = (QSequenceDifferenceBlock) blocksList.get(i);
                    if (block.getLeftSize() > 0) {
                        deleteBlameChunk(block.getRightFrom(), block.getLeftSize(), chain);
                    }
                    if (block.getRightSize() > 0) {
                        insertBlameChunk(myCurrentRevision, myCurrentAuthor,
                                         myCurrentDate, myCurrentPath,
                                         block.getRightFrom(), block.getRightSize(), chain);
                    }
                }
            } finally {
                result.close();
            }
View Full Code Here
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
            final QSequenceLineResult result = QSequenceLineMedia.createBlocks(new QSequenceLineRAFileData(left), new QSequenceLineRAFileData(right), createSimplifier());
            try {
                List blocksList = result.getBlocks();
                for(int i = 0; i < blocksList.size(); i++) {
                    QSequenceDifferenceBlock block = (QSequenceDifferenceBlock) blocksList.get(i);
                    copyOldLinesToNewLines(oldStart, newStart, block.getLeftFrom() - oldStart, myLines, newLines, result.getRightCache());
                    // copy all from right.
                    for (int j = block.getRightFrom(); j <= block.getRightTo(); j++) {
                        LineInfo line = new LineInfo();
                        line.revision = myCurrentDate != null ? myCurrentRevision : -1;
                        line.author = myCurrentAuthor;
                        line.line = result.getRightCache().getLine(j).getContentBytes();
                        line.date = myCurrentDate;
                        newLines.add(line);
                    }
                  oldStart = block.getLeftTo() + 1;
                  newStart = block.getRightTo() + 1;
                }
                copyOldLinesToNewLines(oldStart, newStart, myLines.size() - oldStart, myLines, newLines, result.getRightCache());
                myLines = newLines;
            }
            finally {
View Full Code Here
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
            final QSequenceLineResult result = QSequenceLineMedia.createBlocks(new QSequenceLineRAFileData(left), new QSequenceLineRAFileData(right), createSimplifier());
            try {
                List blocksList = result.getBlocks();
                for(int i = 0; i < blocksList.size(); i++) {
                    QSequenceDifferenceBlock block = (QSequenceDifferenceBlock) blocksList.get(i);
                    if (block.getLeftSize() > 0) {
                        deleteBlameChunk(block.getRightFrom(), block.getLeftSize(), chain);
                    }
                    if (block.getRightSize() > 0) {
                        insertBlameChunk(myCurrentRevision, myCurrentAuthor,
                                         myCurrentDate, myCurrentPath,
                                         block.getRightFrom(), block.getRightSize(), chain);
                    }
                }
            } finally {
                result.close();
            }
View Full Code Here
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
            final QSequenceLineResult result = QSequenceLineMedia.createBlocks(new QSequenceLineRAFileData(left), new QSequenceLineRAFileData(right), createSimplifier());
            try {
                List blocksList = result.getBlocks();
                for(int i = 0; i < blocksList.size(); i++) {
                    QSequenceDifferenceBlock block = (QSequenceDifferenceBlock) blocksList.get(i);
                    if (block.getLeftSize() > 0) {
                        deleteBlameChunk(block.getRightFrom(), block.getLeftSize(), chain);
                    }
                    if (block.getRightSize() > 0) {
                        insertBlameChunk(myCurrentRevision, myCurrentAuthor,
                                         myCurrentDate, myCurrentPath,
                                         block.getRightFrom(), block.getRightSize(), chain);
                    }
                }
            } finally {
                result.close();
            }
View Full Code Here
102
103
104
105
106
107
108
109
110
111
112
113
          latest.forward();
          continue;
        }

        if (local.hasCurrent() && latest.hasCurrent()) {
          final QSequenceDifferenceBlock localStartBlock = local.current();
          final QSequenceDifferenceBlock latestStartBlock = latest.current();
          if (checkConflict(local, latest, localLines, latestLines, baseLines.getLineCount())) {
            baseLineIndex = createConflict(result, localStartBlock, local.current(), latestStartBlock, latest.current(), localLines, latestLines, baseLineIndex, transformedLocalLines);
            local.forward();
            latest.forward();
            conflict = true;
View Full Code Here
TOP

Related Classes of de.regnis.q.sequence.QSequenceDifferenceBlock

  • org.exist.versioning.svn.internal.wc.FSMergerBySequence
  • org.exist.versioning.svn.SVNAnnotationGenerator
  • org.tmatesoft.svn.core.internal.wc.FSMergerBySequence
  • org.tmatesoft.svn.core.SVNAnnotationGenerator
    • Copyright © 2018 www.massapicom. All rights reserved.
    All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.