Package org.eclipse.jgit.revwalk

Examples of org.eclipse.jgit.revwalk.RevWalk.markStart()


    assertEquals("merge resolution", read(FILE1));
    assertEquals("new content two", read("file2"));
    assertEquals("more changess", read("file3"));
    assertEquals("fileg", read("fileg"));

    rw.markStart(rw.parseCommit(db.resolve("refs/heads/topic")));
    RevCommit newF = rw.next();
    assertDerivedFrom(newF, f);
    RevCommit newD = rw.next();
    assertDerivedFrom(newD, d);
    assertEquals(2, newD.getParentCount());
View Full Code Here


    // Get the HEAD and HEAD~1 commits
    Repository targetRepo = target.getRepository();
    RevWalk revWalk = new RevWalk(targetRepo);
    ObjectId headId = targetRepo.resolve(Constants.HEAD);
    RevCommit root = revWalk.parseCommit(headId);
    revWalk.markStart(root);
    // HEAD
    RevCommit head = revWalk.next();
    // HEAD~1
    RevCommit beforeHead = revWalk.next();
View Full Code Here

    }
    assertFileContentsEqual(sourceFile, "content");

    RevWalk rw = new RevWalk(dbTarget);
    rw.sort(RevSort.TOPO);
    rw.markStart(rw.parseCommit(dbTarget.resolve("refs/heads/master")));

    RevCommit next;
    if (expectedPullMode == TestPullMode.MERGE) {
      next = rw.next();
      assertEquals(2, next.getParentCount());
View Full Code Here

    RevCommit localCommit = walk.parseCommit(local.getObjectId());
    RevCommit trackingCommit = walk.parseCommit(tracking.getObjectId());

    walk.setRevFilter(RevFilter.MERGE_BASE);
    walk.markStart(localCommit);
    walk.markStart(trackingCommit);
    RevCommit mergeBase = walk.next();

    walk.reset();
    walk.setRevFilter(RevFilter.ALL);
View Full Code Here

    RevCommit localCommit = walk.parseCommit(local.getObjectId());
    RevCommit trackingCommit = walk.parseCommit(tracking.getObjectId());

    walk.setRevFilter(RevFilter.MERGE_BASE);
    walk.markStart(localCommit);
    walk.markStart(trackingCommit);
    RevCommit mergeBase = walk.next();

    walk.reset();
    walk.setRevFilter(RevFilter.ALL);
    int aheadCount = RevWalkUtils.count(walk, localCommit, mergeBase);
View Full Code Here

        nextFlg = nextIn == maxCommits ? PackBitmapIndex.FLAG_REUSE : 0;
        mustPick = nextIn == 0;

        BitmapBuilder fullBitmap = commitBitmapIndex.newBitmapBuilder();
        rw.reset();
        rw.markStart(c);
        for (AnyObjectId objectId : result.reuse)
          rw.markUninteresting(rw.parseCommit(objectId));
        rw.setRevFilter(
            PackWriterBitmapWalker.newRevFilter(null, fullBitmap));
View Full Code Here

      } catch (IOException e) {
        throw new TransportException(transport.uri, e.getMessage(), e);
      }
      for (final Ref r : localRefs.values()) {
        try {
          rw.markStart(rw.parseCommit(r.getObjectId()));
        } catch (IOException readError) {
          // If we cannot read the value of the ref skip it.
        }
      }
View Full Code Here

      tw.setFilter(TreeFilter.ANY_DIFF);
      tw.setRecursive(true);

      ObjectId start = db.resolve(Constants.HEAD);
      startId = or.abbreviate(start);
      rw.markStart(rw.parseCommit(start));
      for (;;) {
        final RevCommit c = rw.next();
        if (c == null)
          break;
        commits++;
View Full Code Here

      if (mergeBaseFilter) {
        RevWalk walk = new RevWalk(db);
        try {
          walk.setRevFilter(RevFilter.MERGE_BASE);
          RevCommit toRevCommit = walk.lookupCommit(toObjectId);
          walk.markStart(toRevCommit);
          RevCommit fromRevCommit = walk.lookupCommit(fromObjectId);
          walk.markUninteresting(fromRevCommit);
          RevCommit next = walk.next();
          walk.reset();
          walk.setRevFilter(RevFilter.ALL);
View Full Code Here

        throw new MissingBundlePrerequisiteException(transport.uri,
            missing);

      for (final Ref r : transport.local.getAllRefs().values()) {
        try {
          rw.markStart(rw.parseCommit(r.getObjectId()));
        } catch (IOException readError) {
          // If we cannot read the value of the ref skip it.
        }
      }
View Full Code Here

TOP
Copyright © 2018 www.massapi.com. 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.