Package de.regnis.q.sequence.line

Examples of de.regnis.q.sequence.line.QSequenceLineResult

488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
        RandomAccessFile right = null;
        try {
            left = new RandomAccessFile(previousFile, "r");
            right = new RandomAccessFile(currentFile, "r");

            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();
            }
        } catch (Throwable e) {
            SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.UNKNOWN, "Exception while generating annotation: {0}", e.getMessage());
            SVNErrorManager.error(err, e, SVNLogType.DEFAULT);
        } finally {
View Full Code Here
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
    //        dump("base", baseData);
    //        dump("latest", latestData);
    //        dump("local", localData);

    final QSequenceLineResult localResult;
    final QSequenceLineResult latestResult;
    final QSequenceLineTeeSimplifier mySimplifer = createSimplifier(options);
    try {
      localResult = QSequenceLineMedia.createBlocks(baseData, localData, mySimplifer);
      latestResult = QSequenceLineMedia.createBlocks(baseData, latestData, mySimplifer);
    }
    catch (QSequenceException ex) {
      throw new IOException(ex.getMessage());
    }

    try {
      final QSequenceLineCache baseLines = localResult.getLeftCache();
      final QSequenceLineCache localLines = localResult.getRightCache();
      final QSequenceLineCache latestLines = latestResult.getRightCache();
      final FSMergerBySequenceList local = new FSMergerBySequenceList(localResult.getBlocks());
      final FSMergerBySequenceList latest = new FSMergerBySequenceList(latestResult.getBlocks());
      final List transformedLocalLines = transformLocalLines(localResult.getBlocks(), localLines);

      int baseLineIndex = -1;
      boolean conflict = false;
      boolean merged = false;

      while (local.hasCurrent() || latest.hasCurrent()) {
        if (local.hasCurrent() && latest.hasCurrent() && isEqualChange(local.current(), latest.current(), localLines, latestLines)) {
          baseLineIndex = appendLines(result, local.current(), localLines, baseLineIndex, transformedLocalLines);
          local.forward();
          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;
            continue;
          }
        }

        if (local.hasCurrent() && isBefore(local.current(), latest.hasCurrent() ? latest.current() : null)) {
          baseLineIndex = appendLines(result, local.current(), localLines, baseLineIndex, transformedLocalLines);
          local.forward();
          merged = true;
          continue;
        }

        if (latest.hasCurrent()) {
          baseLineIndex = appendLines(result, latest.current(), latestLines, baseLineIndex, transformedLocalLines);
          latest.forward();
          merged = true;
        }
      }

      appendTransformedLocalLines(baseLineIndex, baseLines.getLineCount(), transformedLocalLines, result);

      if (conflict) {
        return CONFLICTED;
      }
      else if (merged) {
        return MERGED;
      }
      else {
        return NOT_MODIFIED;
      }
    }
    finally {
      latestResult.close();
      localResult.close();
    }
  }
View Full Code Here
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
                   QSequenceLineRAData localData, QSequenceLineRAData latestData,
                   SVNDiffOptions options,
                   OutputStream result,
                   SVNDiffConflictChoiceStyle style) throws IOException {

    final QSequenceLineResult localResult;
    final QSequenceLineResult latestResult;
    final QSequenceLineTeeSimplifier mySimplifer = createSimplifier(options);
    try {
      localResult = QSequenceLineMedia.createBlocks(baseData, localData, mySimplifer);
      latestResult = QSequenceLineMedia.createBlocks(baseData, latestData, mySimplifer);
    }
    catch (QSequenceException ex) {
      throw new IOException(ex.getMessage());
    }

    try {
      final QSequenceLineCache baseLines = localResult.getLeftCache();
      final QSequenceLineCache localLines = localResult.getRightCache();
      final QSequenceLineCache latestLines = latestResult.getRightCache();
      final FSMergerBySequenceList local = new FSMergerBySequenceList(localResult.getBlocks());
      final FSMergerBySequenceList latest = new FSMergerBySequenceList(latestResult.getBlocks());
      final List transformedLocalLines = transformLocalLines(localResult.getBlocks(), localLines);

      int baseLineIndex = -1;
      boolean conflict = false;
      boolean merged = false;

      while (local.hasCurrent() || latest.hasCurrent()) {
        if (local.hasCurrent() && latest.hasCurrent() && isEqualChange(local.current(), latest.current(), localLines, latestLines)) {
          baseLineIndex = appendLines(result, local.current(), localLines, baseLineIndex, transformedLocalLines);
          local.forward();
          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();
                        merged = true;
            } else if (style == SVNDiffConflictChoiceStyle.CHOOSE_MODIFIED) {
                        baseLineIndex = appendLines(result, local.current(), localLines, baseLineIndex, transformedLocalLines);
                        local.forward();
                        latest.forward();
                        merged = true;
            } else {
                          //TODO: this is actually SVNDiffConflictChoiceStyle.CHOOSE_MODIFIED_LATEST style
                baseLineIndex = createConflict(result, localStartBlock, local.current(), latestStartBlock, latest.current(), localLines, latestLines, baseLineIndex, transformedLocalLines);
                          local.forward();
                          latest.forward();
                          conflict = true;
            }
            continue;
          }
        }

        if (local.hasCurrent() && isBefore(local.current(), latest.hasCurrent() ? latest.current() : null)) {
          baseLineIndex = appendLines(result, local.current(), localLines, baseLineIndex, transformedLocalLines);
          local.forward();
          merged = true;
          continue;
        }

        if (latest.hasCurrent()) {
          baseLineIndex = appendLines(result, latest.current(), latestLines, baseLineIndex, transformedLocalLines);
          latest.forward();
          merged = true;
        }
      }

      appendTransformedLocalLines(baseLineIndex, baseLines.getLineCount(), transformedLocalLines, result);

      if (conflict) {
        return CONFLICTED;
      }
      else if (merged) {
        return MERGED;
      }
      else {
        return NOT_MODIFIED;
      }
    }
    finally {
      latestResult.close();
      localResult.close();
    }
  }
View Full Code Here
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
        RandomAccessFile right = null;
        try {
            left = new RandomAccessFile(previousFile, "r");
            right = new RandomAccessFile(currentFile, "r");

            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();
            }
        } catch (Throwable e) {
            SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.UNKNOWN, "Exception while generating annotation: {0}", e.getMessage());
            SVNErrorManager.error(err, e, SVNLogType.DEFAULT);
        } finally {
View Full Code Here
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
            ArrayList newLines = new ArrayList();
            int oldStart = 0;
            int newStart = 0;

            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 {
                result.close();
            }
        } catch (Throwable e) {
            SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.UNKNOWN, "Exception while generating annotation: {0}", e.getMessage());
            SVNErrorManager.error(err, e);
        } finally {
View Full Code Here
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
        RandomAccessFile right = null;
        try {
            left = new RandomAccessFile(previousFile, "r");
            right = new RandomAccessFile(currentFile, "r");

            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();
            }
        } catch (Throwable e) {
            SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.UNKNOWN, "Exception while generating annotation: {0}", e.getMessage());
            SVNErrorManager.error(err, e, SVNLogType.DEFAULT);
        } finally {
View Full Code Here
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
        RandomAccessFile right = null;
        try {
            left = new RandomAccessFile(previousFile, "r");
            right = new RandomAccessFile(currentFile, "r");

            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();
            }
        } catch (Throwable e) {
            SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.UNKNOWN, "Exception while generating annotation: {0}", e.getMessage());
            SVNErrorManager.error(err, e, SVNLogType.DEFAULT);
        } finally {
View Full Code Here
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
    //        dump("base", baseData);
    //        dump("latest", latestData);
    //        dump("local", localData);

    final QSequenceLineResult localResult;
    final QSequenceLineResult latestResult;
    final QSequenceLineTeeSimplifier mySimplifer = createSimplifier(options);
    try {
      localResult = QSequenceLineMedia.createBlocks(baseData, localData, mySimplifer);
      latestResult = QSequenceLineMedia.createBlocks(baseData, latestData, mySimplifer);
    }
    catch (QSequenceException ex) {
      throw new IOException(ex.getMessage());
    }

    try {
      final QSequenceLineCache baseLines = localResult.getLeftCache();
      final QSequenceLineCache localLines = localResult.getRightCache();
      final QSequenceLineCache latestLines = latestResult.getRightCache();
      final FSMergerBySequenceList local = new FSMergerBySequenceList(localResult.getBlocks());
      final FSMergerBySequenceList latest = new FSMergerBySequenceList(latestResult.getBlocks());
      final List transformedLocalLines = transformLocalLines(localResult.getBlocks(), localLines);

      int baseLineIndex = -1;
      boolean conflict = false;
      boolean merged = false;

      while (local.hasCurrent() || latest.hasCurrent()) {
        if (local.hasCurrent() && latest.hasCurrent() && isEqualChange(local.current(), latest.current(), localLines, latestLines)) {
          baseLineIndex = appendLines(result, local.current(), localLines, baseLineIndex, transformedLocalLines);
          local.forward();
          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;
            continue;
          }
        }

        if (local.hasCurrent() && isBefore(local.current(), latest.hasCurrent() ? latest.current() : null)) {
          baseLineIndex = appendLines(result, local.current(), localLines, baseLineIndex, transformedLocalLines);
          local.forward();
          merged = true;
          continue;
        }

        if (latest.hasCurrent()) {
          baseLineIndex = appendLines(result, latest.current(), latestLines, baseLineIndex, transformedLocalLines);
          latest.forward();
          merged = true;
        }
      }

      appendTransformedLocalLines(baseLineIndex, baseLines.getLineCount(), transformedLocalLines, result);

      if (conflict) {
        return CONFLICTED;
      }
      else if (merged) {
        return MERGED;
      }
      else {
        return NOT_MODIFIED;
      }
    }
    finally {
      latestResult.close();
      localResult.close();
    }
  }
View Full Code Here
TOP

Related Classes of de.regnis.q.sequence.line.QSequenceLineResult

  • 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.