Package org.eclipse.jgit.diff

Examples of org.eclipse.jgit.diff.RawText$Factory

538
539
540
541
542
543
544
545
546
547
548
549
550
551
   * @throws IOException
   */
  private MergeResult<RawText> contentMerge(CanonicalTreeParser base,
      CanonicalTreeParser ours, CanonicalTreeParser theirs)
      throws IOException {
    RawText baseText = base == null ? RawText.EMPTY_TEXT : getRawText(
        base.getEntryObjectId(), db);
    RawText ourText = ours == null ? RawText.EMPTY_TEXT : getRawText(
        ours.getEntryObjectId(), db);
    RawText theirsText = theirs == null ? RawText.EMPTY_TEXT : getRawText(
        theirs.getEntryObjectId(), db);
    return (mergeAlgorithm.merge(RawTextComparator.DEFAULT, baseText,
        ourText, theirsText));
  }
View Full Code Here
705
706
707
708
709
710
711
712
  }

  private static RawText getRawText(ObjectId id, Repository db)
      throws IOException {
    if (id.equals(ObjectId.zeroId()))
      return new RawText(new byte[] {});
    return new RawText(db.open(id, Constants.OBJ_BLOB).getCachedBytes());
  }
View Full Code Here
259
260
261
262
263
264
265
   * @throws IOException
   *             the repository cannot be read.
   */
  public BlameGenerator push(String description, byte[] contents)
      throws IOException {
    return push(description, new RawText(contents));
  }
View Full Code Here
314
315
316
317
318
319
320
321
322
323
324
    if (ldr.getType() == OBJ_BLOB) {
      if (description == null)
        description = JGitText.get().blameNotCommittedYet;
      BlobCandidate c = new BlobCandidate(description, resultPath);
      c.sourceBlob = id.toObjectId();
      c.sourceText = new RawText(ldr.getCachedBytes(Integer.MAX_VALUE));
      c.regionList = new Region(0, 0, c.sourceText.size());
      remaining = c.sourceText.size();
      push(c);
      return this;
    }
View Full Code Here
212
213
214
215
216
217
218
219
220
221
222
          if (0 <= entry)
            gen.push(null, dc.getEntry(entry).getObjectId());

          File inTree = new File(repo.getWorkTree(), path);
          if (inTree.isFile())
            gen.push(null, new RawText(inTree));
        }
      }
      return gen.computeBlameResult();
    } catch (IOException e) {
      throw new JGitInternalException(e.getMessage(), e);
View Full Code Here
258
259
260
261
262
263
264
   * @throws IOException
   *             the repository cannot be read.
   */
  public BlameGenerator push(String description, byte[] contents)
      throws IOException {
    return push(description, new RawText(contents));
  }
View Full Code Here
313
314
315
316
317
318
319
320
321
322
323
    if (ldr.getType() == OBJ_BLOB) {
      if (description == null)
        description = JGitText.get().blameNotCommittedYet;
      BlobCandidate c = new BlobCandidate(description, resultPath);
      c.sourceBlob = id.toObjectId();
      c.sourceText = new RawText(ldr.getCachedBytes(Integer.MAX_VALUE));
      c.regionList = new Region(0, 0, c.sourceText.size());
      remaining = c.sourceText.size();
      push(c);
      return this;
    }
View Full Code Here
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
        }

        unmergedPaths.add(tw.getPathString());

        // generate a MergeResult for the deleted file
        RawText baseText = base == null ? RawText.EMPTY_TEXT
            : getRawText(base.getEntryObjectId(), db);
        RawText ourText = ours == null ? RawText.EMPTY_TEXT
            : getRawText(ours.getEntryObjectId(), db);
        RawText theirsText = theirs == null ? RawText.EMPTY_TEXT
            : getRawText(theirs.getEntryObjectId(), db);
        MergeResult<RawText> result = mergeAlgorithm.merge(
            RawTextComparator.DEFAULT, baseText, ourText,
            theirsText);
        mergeResults.put(tw.getPathString(), result);
View Full Code Here
523
524
525
526
527
528
529
530
531
532
533
  private boolean contentMerge(CanonicalTreeParser base,
      CanonicalTreeParser ours, CanonicalTreeParser theirs)
      throws FileNotFoundException, IllegalStateException, IOException {
    MergeFormatter fmt = new MergeFormatter();

    RawText baseText = base == null ? RawText.EMPTY_TEXT : getRawText(
        base.getEntryObjectId(), db);

    // do the merge
    MergeResult<RawText> result = mergeAlgorithm.merge(
        RawTextComparator.DEFAULT, baseText,
View Full Code Here
596
597
598
599
600
601
602
603
  }

  private static RawText getRawText(ObjectId id, Repository db)
      throws IOException {
    if (id.equals(ObjectId.zeroId()))
      return new RawText(new byte[] {});
    return new RawText(db.open(id, Constants.OBJ_BLOB).getCachedBytes());
  }
View Full Code Here
TOP

Related Classes of org.eclipse.jgit.diff.RawText$Factory

  • asia.redact.bracket.properties.alt.DotPropertiesParser
  • asia.redact.bracket.properties.line.LineScanner
  • asia.redact.bracket.properties.mgmt.Attributes
  • asia.redact.bracket.properties.mgmt.LoadList
  • avrora.sim.clock.ClockDomain
  • avrora.sim.mcu.ATMega128
  • backtype.storm.tuple.Values
  • com.eviware.soapui.impl.wadl.inference.schema.types.EmptyType
  • com.eviware.soapui.impl.wsdl.panels.assertions.AssertionListEntry
  • com.google.collide.server.shared.merge.JGitMerger
    • 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.