Examples of org.eclipse.jgit.dircache.DirCacheBuilder

org.eclipse.jgit.dircache.DirCacheBuilder
Updates a {@link DirCache} by adding individual {@link DirCacheEntry}s.
A builder always starts from a clean slate and appends in every single DirCacheEntry which the final updated index must have to reflect its new content.
For maximum performance applications should add entries in path name order. Adding entries out of order is permitted, however a final sorting pass will be implicitly performed during {@link #finish()} to correct any out-of-orderentries. Duplicate detection is also delayed until the sorting is complete. @see DirCacheEditor

            + diff.getModified(), diff.getModified().isEmpty());
  }


  private void verifyStageState(StageState expected, int... stages)
      throws IOException {
    DirCacheBuilder builder = db.lockDirCache().builder();
    for (int stage : stages) {
      DirCacheEntry entry = createEntry("a", FileMode.REGULAR_FILE,
          stage, "content");
      builder.add(entry);
    }
    builder.commit();


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

View Full Code Here

  public void testTrivialTwoWay_validSubtreeSort() throws Exception {
    final DirCache treeB = db.readDirCache();
    final DirCache treeO = db.readDirCache();
    final DirCache treeT = db.readDirCache();
    {
      final DirCacheBuilder b = treeB.builder();
      final DirCacheBuilder o = treeO.builder();
      final DirCacheBuilder t = treeT.builder();


      b.add(createEntry("libelf-po/a", FileMode.REGULAR_FILE));
      b.add(createEntry("libelf/c", FileMode.REGULAR_FILE));


      o.add(createEntry("Makefile", FileMode.REGULAR_FILE));
      o.add(createEntry("libelf-po/a", FileMode.REGULAR_FILE));
      o.add(createEntry("libelf/c", FileMode.REGULAR_FILE));


      t.add(createEntry("libelf-po/a", FileMode.REGULAR_FILE));
      t.add(createEntry("libelf/c", FileMode.REGULAR_FILE, "blah"));


      b.finish();
      o.finish();
      t.finish();
    }


    final ObjectInserter ow = db.newObjectInserter();
    final ObjectId b = commit(ow, treeB, new ObjectId[] {});
    final ObjectId o = commit(ow, treeO, new ObjectId[] { b });

View Full Code Here

  public void testTrivialTwoWay_concurrentSubtreeChange() throws Exception {
    final DirCache treeB = db.readDirCache();
    final DirCache treeO = db.readDirCache();
    final DirCache treeT = db.readDirCache();
    {
      final DirCacheBuilder b = treeB.builder();
      final DirCacheBuilder o = treeO.builder();
      final DirCacheBuilder t = treeT.builder();


      b.add(createEntry("d/o", FileMode.REGULAR_FILE));
      b.add(createEntry("d/t", FileMode.REGULAR_FILE));


      o.add(createEntry("d/o", FileMode.REGULAR_FILE, "o !"));
      o.add(createEntry("d/t", FileMode.REGULAR_FILE));


      t.add(createEntry("d/o", FileMode.REGULAR_FILE));
      t.add(createEntry("d/t", FileMode.REGULAR_FILE, "t !"));


      b.finish();
      o.finish();
      t.finish();
    }


    final ObjectInserter ow = db.newObjectInserter();
    final ObjectId b = commit(ow, treeB, new ObjectId[] {});
    final ObjectId o = commit(ow, treeO, new ObjectId[] { b });

View Full Code Here

  public void testTrivialTwoWay_conflictSubtreeChange() throws Exception {
    final DirCache treeB = db.readDirCache();
    final DirCache treeO = db.readDirCache();
    final DirCache treeT = db.readDirCache();
    {
      final DirCacheBuilder b = treeB.builder();
      final DirCacheBuilder o = treeO.builder();
      final DirCacheBuilder t = treeT.builder();


      b.add(createEntry("d/o", FileMode.REGULAR_FILE));
      b.add(createEntry("d/t", FileMode.REGULAR_FILE));


      o.add(createEntry("d/o", FileMode.REGULAR_FILE));
      o.add(createEntry("d/t", FileMode.REGULAR_FILE, "o !"));


      t.add(createEntry("d/o", FileMode.REGULAR_FILE, "t !"));
      t.add(createEntry("d/t", FileMode.REGULAR_FILE, "t !"));


      b.finish();
      o.finish();
      t.finish();
    }


    final ObjectInserter ow = db.newObjectInserter();
    final ObjectId b = commit(ow, treeB, new ObjectId[] {});
    final ObjectId o = commit(ow, treeO, new ObjectId[] { b });

View Full Code Here

  public void testTrivialTwoWay_leftDFconflict1() throws Exception {
    final DirCache treeB = db.readDirCache();
    final DirCache treeO = db.readDirCache();
    final DirCache treeT = db.readDirCache();
    {
      final DirCacheBuilder b = treeB.builder();
      final DirCacheBuilder o = treeO.builder();
      final DirCacheBuilder t = treeT.builder();


      b.add(createEntry("d/o", FileMode.REGULAR_FILE));
      b.add(createEntry("d/t", FileMode.REGULAR_FILE));


      o.add(createEntry("d", FileMode.REGULAR_FILE));


      t.add(createEntry("d/o", FileMode.REGULAR_FILE));
      t.add(createEntry("d/t", FileMode.REGULAR_FILE, "t !"));


      b.finish();
      o.finish();
      t.finish();
    }


    final ObjectInserter ow = db.newObjectInserter();
    final ObjectId b = commit(ow, treeB, new ObjectId[] {});
    final ObjectId o = commit(ow, treeO, new ObjectId[] { b });

View Full Code Here

  public void testTrivialTwoWay_rightDFconflict1() throws Exception {
    final DirCache treeB = db.readDirCache();
    final DirCache treeO = db.readDirCache();
    final DirCache treeT = db.readDirCache();
    {
      final DirCacheBuilder b = treeB.builder();
      final DirCacheBuilder o = treeO.builder();
      final DirCacheBuilder t = treeT.builder();


      b.add(createEntry("d/o", FileMode.REGULAR_FILE));
      b.add(createEntry("d/t", FileMode.REGULAR_FILE));


      o.add(createEntry("d/o", FileMode.REGULAR_FILE));
      o.add(createEntry("d/t", FileMode.REGULAR_FILE, "o !"));


      t.add(createEntry("d", FileMode.REGULAR_FILE));


      b.finish();
      o.finish();
      t.finish();
    }


    final ObjectInserter ow = db.newObjectInserter();
    final ObjectId b = commit(ow, treeB, new ObjectId[] {});
    final ObjectId o = commit(ow, treeO, new ObjectId[] { b });

View Full Code Here

  public void testTrivialTwoWay_leftDFconflict2() throws Exception {
    final DirCache treeB = db.readDirCache();
    final DirCache treeO = db.readDirCache();
    final DirCache treeT = db.readDirCache();
    {
      final DirCacheBuilder b = treeB.builder();
      final DirCacheBuilder o = treeO.builder();
      final DirCacheBuilder t = treeT.builder();


      b.add(createEntry("d", FileMode.REGULAR_FILE));


      o.add(createEntry("d", FileMode.REGULAR_FILE, "o !"));


      t.add(createEntry("d/o", FileMode.REGULAR_FILE));


      b.finish();
      o.finish();
      t.finish();
    }


    final ObjectInserter ow = db.newObjectInserter();
    final ObjectId b = commit(ow, treeB, new ObjectId[] {});
    final ObjectId o = commit(ow, treeO, new ObjectId[] { b });

View Full Code Here

  public void testTrivialTwoWay_rightDFconflict2() throws Exception {
    final DirCache treeB = db.readDirCache();
    final DirCache treeO = db.readDirCache();
    final DirCache treeT = db.readDirCache();
    {
      final DirCacheBuilder b = treeB.builder();
      final DirCacheBuilder o = treeO.builder();
      final DirCacheBuilder t = treeT.builder();


      b.add(createEntry("d", FileMode.REGULAR_FILE));


      o.add(createEntry("d/o", FileMode.REGULAR_FILE));


      t.add(createEntry("d", FileMode.REGULAR_FILE, "t !"));


      b.finish();
      o.finish();
      t.finish();
    }


    final ObjectInserter ow = db.newObjectInserter();
    final ObjectId b = commit(ow, treeB, new ObjectId[] {});
    final ObjectId o = commit(ow, treeO, new ObjectId[] { b });

View Full Code Here

    writeTrashFile("b", "second file content - master");
    git.add().addFilepattern("b").call();
    git.commit().setMessage("master commit").call();


    // Simulate a failed merge of branch into master
    DirCacheBuilder builder = db.lockDirCache().builder();
    DirCacheEntry entry = createEntry("a", FileMode.REGULAR_FILE, 0,
        "content");
    builder.add(entry);
    entry = createEntry("b", FileMode.REGULAR_FILE, 2,
        "second file content - master");
    builder.add(entry);
    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();

View Full Code Here


  @Test
  public void commitOnlyShouldCommitUnmergedPathAndNotAffectOthers()
      throws Exception {
    DirCache index = db.lockDirCache();
    DirCacheBuilder builder = index.builder();
    addUnmergedEntry("unmerged1", builder);
    addUnmergedEntry("unmerged2", builder);
    DirCacheEntry other = new DirCacheEntry("other");
    other.setFileMode(FileMode.REGULAR_FILE);
    builder.add(other);
    builder.commit();


    writeTrashFile("unmerged1", "unmerged1 data");
    writeTrashFile("unmerged2", "unmerged2 data");
    writeTrashFile("other", "other data");

View Full Code Here

0 1 2 3 4 5 6 7 8 9

TOP

Related Classes of org.eclipse.jgit.dircache.DirCacheBuilder

com.gitblit.tickets.BranchTicketService

com.gitblit.utils.RefLogUtils

com.gitblit.wicket.pages.NewRepositoryPage

com.google.gerrit.server.git.SubmoduleOp

com.google.gerrit.server.git.SubmoduleOpTest

com.google.gerrit.server.git.VersionedMetaData

com.google.gerrit.server.patch.PatchListLoader

com.google.gerrit.server.tools.hooks.CommitMsgHookTest

org.eclipse.egit.core.GitMoveDeleteHook

org.eclipse.egit.core.GitMoveDeleteHookTest

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.