Examples of org.eclipse.jgit.treewalk.FileTreeIterator

org.eclipse.jgit.treewalk.FileTreeIterator
Working directory iterator for standard Java IO.
This iterator uses the standard java.io package to read the specified working directory as part of a {@link TreeWalk}.

    modifyIndex(indexState, "f", "side");


    ResolveMerger merger = (ResolveMerger) strategy.newMerger(db,
        worktreeState == WorktreeState.Bare);
    if (worktreeState != WorktreeState.Bare)
      merger.setWorkingTreeIterator(new FileTreeIterator(db));
    try {
      boolean expectSuccess = true;
      if (!(indexState == IndexState.Bare
          || indexState == IndexState.Missing || indexState == IndexState.SameAsHead))
        // index is dirty

View Full Code Here

    modifyIndex(indexState, "f", "side");


    ResolveMerger merger = (ResolveMerger) strategy.newMerger(db,
        worktreeState == WorktreeState.Bare);
    if (worktreeState != WorktreeState.Bare)
      merger.setWorkingTreeIterator(new FileTreeIterator(db));
    try {
      boolean expectSuccess = true;
      if (!(indexState == IndexState.Bare
          || indexState == IndexState.Missing || indexState == IndexState.SameAsHead))
        // index is dirty

View Full Code Here

    modifyIndex(indexState, "f", "side");


    ResolveMerger merger = (ResolveMerger) strategy.newMerger(db,
        worktreeState == WorktreeState.Bare);
    if (worktreeState != WorktreeState.Bare)
      merger.setWorkingTreeIterator(new FileTreeIterator(db));
    try {
      assertFalse(merger.merge(new RevCommit[] { m2, s2 }));
      assertEquals(MergeStrategy.RECURSIVE, strategy);
      if (indexState == IndexState.SameAsHead
          && worktreeState == WorktreeState.SameAsHead) {

View Full Code Here

    modifyIndex(indexState, "f", "side");


    ResolveMerger merger = (ResolveMerger) strategy.newMerger(db,
        worktreeState == WorktreeState.Bare);
    if (worktreeState != WorktreeState.Bare)
      merger.setWorkingTreeIterator(new FileTreeIterator(db));
    try {
      boolean expectSuccess = true;
      if (!(indexState == IndexState.Bare
          || indexState == IndexState.Missing || indexState == IndexState.SameAsHead))
        // index is dirty

View Full Code Here

    writeTrashFile("b.txt", "new line");


    // when
    TreeWalk walk = new TreeWalk(db);
    walk.addTree(c.getTree());
    walk.addTree(new FileTreeIterator(db));
    List<DiffEntry> result = DiffEntry.scan(walk, true);


    // then
    assertThat(Integer.valueOf(result.size()), is(Integer.valueOf(1)));
    DiffEntry entry = result.get(0);

View Full Code Here

        newTree = new DirCacheIterator(repo.readDirCache());
      } else {
        if (oldTree == null)
          oldTree = new DirCacheIterator(repo.readDirCache());
        if (newTree == null)
          newTree = new FileTreeIterator(repo);
      }


      diffFmt.setPathFilter(pathFilter);


      List<DiffEntry> result = diffFmt.scan(oldTree, newTree);

View Full Code Here

    // Git git = new Git(db);
    DiffCommand diff = new DiffCommand(db);
    diff.setOutputStream(out);
    diff.setIgnoreWhiteSpace(ignoreWS);
    AbstractTreeIterator oldTree;
    AbstractTreeIterator newTree = new FileTreeIterator(db);
    if (scope.contains("..")) { //$NON-NLS-1$
      String[] commits = scope.split("\\.\\."); //$NON-NLS-1$
      if (commits.length != 2) {
        String msg = NLS.bind("Failed to generate diff for {0}", scope);
        statusHandler.handleRequest(request, response, new ServerStatus(IStatus.ERROR, HttpServletResponse.SC_BAD_REQUEST, msg, null));

View Full Code Here

        untrackedCommit = revWalk.parseCommit(stashCommit.getParent(2));


      ResolveMerger merger = (ResolveMerger) strategy.newMerger(repo);
      merger.setCommitNames(new String[] { "stashed HEAD", "HEAD", "stash" });
      merger.setBase(stashHeadCommit);
      merger.setWorkingTreeIterator(new FileTreeIterator(repo));
      if (merger.merge(headCommit, stashCommit)) {
        DirCache dc = repo.lockDirCache();
        DirCacheCheckout dco = new DirCacheCheckout(repo, headTree, dc, merger.getResultTreeId());
        dco.setFailOnConflict(true);
        dco.checkout(); // Ignoring failed deletes....

View Full Code Here

  private void resetUntracked(RevTree tree) throws CheckoutConflictException, IOException {
    TreeWalk walk = null;
    try {
      walk = new TreeWalk(repo); // maybe NameConflictTreeWalk?
      walk.addTree(tree);
      walk.addTree(new FileTreeIterator(repo));
      walk.setRecursive(true);


      final ObjectReader reader = walk.getObjectReader();


      while (walk.next()) {
        final AbstractTreeIterator cIter = walk.getTree(0, AbstractTreeIterator.class);
        if (cIter == null)
          // Not in commit, don't create untracked
          continue;


        final DirCacheEntry entry = new DirCacheEntry(walk.getRawPath());
        entry.setFileMode(cIter.getEntryFileMode());
        entry.setObjectIdFromRaw(cIter.idBuffer(), cIter.idOffset());


        FileTreeIterator fIter = walk.getTree(1, FileTreeIterator.class);
        if (fIter != null) {
          if (fIter.isModified(entry, true, reader)) {
            // file exists and is dirty
            throw new CheckoutConflictException(entry.getPathString());
          }
        }

View Full Code Here

   *            the id of the tree we want to fast-forward to
   * @throws IOException
   */
  public DirCacheCheckout(Repository repo, ObjectId headCommitTree,
      DirCache dc, ObjectId mergeCommitTree) throws IOException {
    this(repo, headCommitTree, dc, mergeCommitTree, new FileTreeIterator(repo));
  }

View Full Code Here

0 1 2 3 4 5 6 7 8 9

TOP

Related Classes of org.eclipse.jgit.treewalk.FileTreeIterator

com.atlassian.jgitflow.core.util.GitHelper

com.github.koraktor.mavanagaiata.git.jgit.JGitRepository

com.github.koraktor.mavanagaiata.git.jgit.JGitRepositoryTest

com.nirima.jenkins.GitStatus$Status

org.eclipse.egit.core.op.BranchOperation

org.eclipse.egit.core.op.CreatePatchOperation

org.eclipse.egit.core.synchronize.GitSyncCache

org.eclipse.egit.core.synchronize.WorkingTreeChangeCache

org.eclipse.egit.ui.internal.actions.CompareIndexWithHeadActionHandler

org.eclipse.egit.ui.internal.merge.GitMergeEditorInput

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.