Package org.eclipse.jgit.api

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

91
92
93
94
95
96
97
98
99
100
101
    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
142
143
144
145
146
147
148
149
150
151
152
    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
143
144
145
146
147
148
149
150
151
152
153
        .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
79
80
81
82
83
84
85
86
87
88
89
    writeTrashFile("a", "Hello world a");
    writeTrashFile("b", "Hello world b");
    git.add().addFilepattern(".").call();
    git.commit().setMessage("add files a & b").call();
    Ref branch_1 = git.branchCreate().setName("branch_1").call();
    git.rm().addFilepattern("a").call();
    FileUtils.createSymLink(new File(db.getWorkTree(), "a"), "b");
    git.add().addFilepattern("a").call();
    git.commit().setMessage("add symlink a").call();

    FileEntry entry = new FileTreeIterator.FileEntry(new File(
View Full Code Here
112
113
114
115
116
117
118
119
120
121
122
    writeTrashFile("b", "Hello world b");
    FileUtils.createSymLink(new File(db.getWorkTree(), "a"), "b");
    git.add().addFilepattern(".").call();
    git.commit().setMessage("add file b & symlink a").call();
    Ref branch_1 = git.branchCreate().setName("branch_1").call();
    git.rm().addFilepattern("a").call();
    writeTrashFile("a", "Hello world a");
    git.add().addFilepattern("a").call();
    git.commit().setMessage("add file a").call();

    FileEntry entry = new FileTreeIterator.FileEntry(new File(
View Full Code Here
146
147
148
149
150
151
152
153
154
155
156
    writeTrashFile("a/b", "Hello world b");
    writeTrashFile("c", "Hello world c");
    git.add().addFilepattern(".").call();
    git.commit().setMessage("add folder a").call();
    Ref branch_1 = git.branchCreate().setName("branch_1").call();
    git.rm().addFilepattern("a").call();
    FileUtils.createSymLink(new File(db.getWorkTree(), "a"), "c");
    git.add().addFilepattern("a").call();
    git.commit().setMessage("add symlink a").call();

    FileEntry entry = new FileTreeIterator.FileEntry(new File(
View Full Code Here
179
180
181
182
183
184
185
186
187
188
189
    writeTrashFile("c", "Hello world c");
    FileUtils.createSymLink(new File(db.getWorkTree(), "a"), "c");
    git.add().addFilepattern(".").call();
    git.commit().setMessage("add symlink a").call();
    Ref branch_1 = git.branchCreate().setName("branch_1").call();
    git.rm().addFilepattern("a").call();
    FileUtils.mkdirs(new File(db.getWorkTree(), "a"));
    writeTrashFile("a/b", "Hello world b");
    git.add().addFilepattern("a").call();
    git.commit().setMessage("add folder a").call();
View Full Code Here
245
246
247
248
249
250
251
252
253
254
255
    FileUtils.createSymLink(new File(db.getWorkTree(), "a"), "b");
    git.add().addFilepattern(".").call();
    RevCommit commit1 = git.commit().setMessage("add file b & symlink a")
        .call();
    Ref branch_1 = git.branchCreate().setName("branch_1").call();
    git.rm().addFilepattern("a").call();
    RevCommit commit2 = git.commit().setMessage("delete symlink a").call();

    git.checkout().setName(branch_1.getName()).call();

    TreeWalk tw = new TreeWalk(db);
View Full Code Here
71
72
73
74
75
76
77
78
79
80
81
    // Create a situation where a checkout of master whould delete a file in
    // a subfolder of the root of the worktree. No other files/folders exist
    writeTrashFile("d/f", "f");
    git.add().addFilepattern(".").call();
    RevCommit initial = git.commit().setMessage("inital").call();
    git.rm().addFilepattern("d/f").call();
    git.commit().setMessage("modifyOnMaster").call();
    git.checkout().setCreateBranch(true).setName("side")
        .setStartPoint(initial).call();
    writeTrashFile("d/f", "f2");
    git.add().addFilepattern(".").call();
View Full Code Here
113
114
115
116
117
118
119
120
121
122
123
    writeTrashFile("stagedModified", "stagedModified modified");
    deleteTrashFile("stagedDeleted");
    writeTrashFile("trackedModified", "trackedModified modified");
    deleteTrashFile("trackedDeleted");
    git.add().addFilepattern("stagedModified").call();
    git.rm().addFilepattern("stagedDeleted").call();
    git.add().addFilepattern("stagedNew").call();
    // Test staged/not-staged status
    assertArrayOfLinesEquals(new String[] { // git status output
        "On branch master", //
            "Changes to be committed:", //
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.