Package org.eclipse.jgit.treewalk

Examples of org.eclipse.jgit.treewalk.FileTreeIterator

604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
    // try and merge
    MergeResult result = git.merge().include(branchCommit).call();
    assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());

    FileTreeIterator iterator = new FileTreeIterator(db);
    IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator);
    diff.diff();

    assertTrue(diff.getChanged().isEmpty());
    assertTrue(diff.getAdded().isEmpty());
    assertTrue(diff.getRemoved().isEmpty());
    assertTrue(diff.getMissing().isEmpty());
    assertTrue(diff.getModified().isEmpty());
    assertEquals(1, diff.getConflicting().size());
    assertTrue(diff.getConflicting().contains("b"));
    assertEquals(StageState.BOTH_ADDED, diff.getConflictingStageStates()
        .get("b"));
    assertTrue(diff.getUntrackedFolders().isEmpty());

    // reset file b to its master state without altering the index
    writeTrashFile("b", "second file content - master");

    // we should have the same result
    iterator = new FileTreeIterator(db);
    diff = new IndexDiff(db, Constants.HEAD, iterator);
    diff.diff();

    assertTrue(diff.getChanged().isEmpty());
    assertTrue(diff.getAdded().isEmpty());
View Full Code Here
676
677
678
679
680
681
682
683
684
685
686
    entry = createEntry("b", FileMode.REGULAR_FILE, 3,
        "second file content - branch");
    builder.add(entry);
    builder.commit();

    FileTreeIterator iterator = new FileTreeIterator(db);
    IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator);
    diff.diff();

    assertTrue(diff.getChanged().isEmpty());
    assertTrue(diff.getAdded().isEmpty());
View Full Code Here
712
713
714
715
716
717
718
719
720
721
722
    // Now set core.autocrlf to input
    config.setEnum(ConfigConstants.CONFIG_CORE_SECTION, null,
        ConfigConstants.CONFIG_KEY_AUTOCRLF, AutoCRLF.INPUT);
    config.save();

    FileTreeIterator iterator = new FileTreeIterator(db);
    IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator);
    diff.diff();

    assertTrue(
        "Expected no modified files, but there were: "
View Full Code Here
732
733
734
735
736
737
738
739
740
741
742
      builder.add(entry);
    }
    builder.commit();

    IndexDiff diff = new IndexDiff(db, Constants.HEAD,
        new FileTreeIterator(db));
    diff.diff();

    assertEquals(
        "Conflict for entries in stages " + Arrays.toString(stages),
        expected, diff.getConflictingStageStates().get("a"));
View Full Code Here
111
112
113
114
115
116
117
118
119
120
    file = new File(folder1, "file3.txt");
    write(file, "folder1--file3.txt");

    ResolveMerger merger = (ResolveMerger) strategy.newMerger(db, false);
    merger.setCommitNames(new String[] { "BASE", "HEAD", "other" });
    merger.setWorkingTreeIterator(new FileTreeIterator(db));
    boolean ok = merger.merge(head.getId(), other.getId());
    assertTrue(ok);
    assertTrue(file.exists());
  }
View Full Code Here
325
326
327
328
329
330
331
332
333
334
335
    ByteArrayOutputStream os = new ByteArrayOutputStream();
    DiffFormatter dfmt = new DiffFormatter(new SafeBufferedOutputStream(os));
    dfmt.setRepository(db);
    dfmt.setPathFilter(PathFilter.create("folder"));
    DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache());
    FileTreeIterator newTree = new FileTreeIterator(db);
    dfmt.format(oldTree, newTree);
    dfmt.flush();

    String actual = os.toString("UTF-8");
    String expected =
View Full Code Here
149
150
151
152
153
154
155
156
157
158
159
        String ourName = calculateOurName(headRef);
        String cherryPickName = srcCommit.getId().abbreviate(7).name()
            + " " + srcCommit.getShortMessage(); //$NON-NLS-1$

        ResolveMerger merger = (ResolveMerger) strategy.newMerger(repo);
        merger.setWorkingTreeIterator(new FileTreeIterator(repo));
        merger.setBase(srcParent.getTree());
        merger.setCommitNames(new String[] { "BASE", ourName,
            cherryPickName });
        if (merger.merge(newHead, srcCommit)) {
          if (AnyObjectId.equals(newHead.getTree().getId(), merger
View Full Code Here
150
151
152
153
154
155
156
157
158
159
160
    modifyIndex(indexState, "s", "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 || indexState == IndexState.SameAsOther))
View Full Code Here
221
222
223
224
225
226
227
228
229
230
231
    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
305
306
307
308
309
310
311
312
313
314
315
    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
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
    • 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.