Examples of rm()


Examples of org.eclipse.jgit.api.Git.rm()

        .setName("side").call();
    writeTrashFile("d/1", "orig");
    git.add().addFilepattern("d/1").call();
    git.commit().setAll(true).setMessage("added d/1 on side").call();

    git.rm().addFilepattern("d/1").call();
    git.rm().addFilepattern("d").call();
    MergeResult mergeRes = git.merge().setStrategy(strategy)
        .include(masterCommit).call();
    assertEquals(MergeStatus.MERGED, mergeRes.getMergeStatus());
    assertEquals(
View Full Code Here

Examples of org.eclipse.jgit.api.Git.rm()

    writeTrashFile("d/1", "orig");
    git.add().addFilepattern("d/1").call();
    git.commit().setAll(true).setMessage("added d/1 on side").call();

    git.rm().addFilepattern("d/1").call();
    git.rm().addFilepattern("d").call();
    MergeResult mergeRes = git.merge().setStrategy(strategy)
        .include(masterCommit).call();
    assertEquals(MergeStatus.MERGED, mergeRes.getMergeStatus());
    assertEquals(
        "[2, mode:100644, content:orig][d/1, mode:100644, content:orig]",
View Full Code Here

Examples of org.eclipse.jgit.api.Git.rm()

    diff = new IndexDiff(db, Constants.HEAD, new FileTreeIterator(db));
    diff.diff();
    assertEquals(new HashSet<String>(Arrays.asList("target", "src/tst")),
        diff.getUntrackedFolders());

    git.rm().addFilepattern("src/com/B.java").addFilepattern("src/org")
        .call();
    git.commit().setMessage("second").call();
    writeTrashFile("src/org/C.java", "");

    diff = new IndexDiff(db, Constants.HEAD, new FileTreeIterator(db));
View Full Code Here

Examples of org.eclipse.jgit.api.Git.rm()

        .setName("side").call();
    writeTrashFile("d/1", "side");
    git.add().addFilepattern("d/1").call();
    git.commit().setAll(true).setMessage("added d/1 on side").call();

    git.rm().addFilepattern("d/1").call();
    git.rm().addFilepattern("d").call();
    MergeResult mergeRes = git.merge().setStrategy(strategy)
        .include(masterCommit).call();
    assertEquals(MergeStatus.CONFLICTING, mergeRes.getMergeStatus());
    assertEquals(
View Full Code Here

Examples of org.eclipse.jgit.api.Git.rm()

    writeTrashFile("d/1", "side");
    git.add().addFilepattern("d/1").call();
    git.commit().setAll(true).setMessage("added d/1 on side").call();

    git.rm().addFilepattern("d/1").call();
    git.rm().addFilepattern("d").call();
    MergeResult mergeRes = git.merge().setStrategy(strategy)
        .include(masterCommit).call();
    assertEquals(MergeStatus.CONFLICTING, mergeRes.getMergeStatus());
    assertEquals(
        "[2, mode:100644, content:orig][d/1, mode:100644, stage:2, content:side][d/1, mode:100644, stage:3, content:master]",
View Full Code Here

Examples of org.eclipse.jgit.api.Git.rm()

    git.checkout().setCreateBranch(true).setStartPoint(first)
        .setName("side").call();
    writeTrashFile("0", "side");
    git.commit().setAll(true).setMessage("modified 0 on side").call();

    git.rm().addFilepattern("0").call();
    writeTrashFile("0/0", "side");
    git.add().addFilepattern("0/0").call();
    MergeResult mergeRes = git.merge().setStrategy(strategy)
        .include(masterCommit).call();
    assertEquals(MergeStatus.FAILED, mergeRes.getMergeStatus());
View Full Code Here

Examples of org.eclipse.jgit.api.Git.rm()

    git.checkout().setCreateBranch(true).setStartPoint(first)
        .setName("side").call();
    writeTrashFile("1", "1\n2\n3side");
    git.commit().setAll(true).setMessage("modified 1 on side").call();

    git.rm().addFilepattern("0").call();
    writeTrashFile("0/0", "modified");
    git.add().addFilepattern("0/0").call();
    try {
      git.merge().setStrategy(strategy).include(masterCommit).call();
      Assert.fail("Didn't get the expected exception");
View Full Code Here

Examples of org.eclipse.jgit.api.Git.rm()

    Git git = new Git(db);
    git.add().addFilepattern(folder1.getName()).call();
    RevCommit base = git.commit().setMessage("adding folder").call();

    recursiveDelete(folder1);
    git.rm().addFilepattern("folder1/file1.txt")
        .addFilepattern("folder1/file2.txt").call();
    RevCommit other = git.commit()
        .setMessage("removing folders on 'other'").call();

    git.checkout().setName(base.name()).call();
View Full Code Here

Examples of org.eclipse.jgit.api.Git.rm()

    git.checkout().setCreateBranch(true).setStartPoint(first)
        .setName("side").call();
    writeTrashFile("d/1", "side");
    git.commit().setAll(true).setMessage("modified d/1 on side").call();

    git.rm().addFilepattern("d/1").call();
    git.rm().addFilepattern("d").call();
    MergeResult mergeRes = git.merge().setStrategy(strategy)
        .include(masterCommit).call();
    assertEquals(MergeStatus.CONFLICTING, mergeRes.getMergeStatus());
    assertEquals(
View Full Code Here

Examples of org.eclipse.jgit.api.Git.rm()

        .setName("side").call();
    writeTrashFile("d/1", "side");
    git.commit().setAll(true).setMessage("modified d/1 on side").call();

    git.rm().addFilepattern("d/1").call();
    git.rm().addFilepattern("d").call();
    MergeResult mergeRes = git.merge().setStrategy(strategy)
        .include(masterCommit).call();
    assertEquals(MergeStatus.CONFLICTING, mergeRes.getMergeStatus());
    assertEquals(
        "[d/1, mode:100644, stage:1, content:orig][d/1, mode:100644, stage:2, content:side][d/1, mode:100644, stage:3, content:master]",
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.