Examples of org.eclipse.jgit.diff.RawText

org.eclipse.jgit.diff.RawText
A Sequence supporting UNIX formatted text in byte[] format.
Elements of the sequence are the lines of the file, as delimited by the UNIX newline character ('\n'). The file content is treated as 8 bit binary text, with no assumptions or requirements on character encoding.
Note that the first line of the file is element 0, as defined by the Sequence interface API. Traditionally in a text editor a patch file the first line is line number 1. Callers may need to subtract 1 prior to invoking methods if they are converting from "line number" to "element index".

   * @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

  }


  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

   * @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

    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

          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

   * @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

    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

        }


        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

  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

  }


  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

0 1 2 3 4 5 6 7 8

TOP

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

com.gitblit.utils.DiffUtils

com.google.collide.server.shared.merge.JGitMerger

com.google.gerrit.server.patch.PatchListLoader

models.FileDiffTest

org.apache.oozie.command.coord.CoordUpdateXCommand

org.apache.torque.generator.merge.ThreeWayMerger

org.eclipse.egit.core.op.CreatePatchOperation

org.eclipse.egit.ui.internal.blame.BlameRevision

org.eclipse.egit.ui.internal.history.FileDiff

org.eclipse.jgit.api.ApplyCommand

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.