Package org.locationtech.geogig.api.porcelain

Examples of org.locationtech.geogig.api.porcelain.CherryPickOp

251
252
253
254
255
256
257
258
259
260
        // checkout master and insert some features
        geogig.command(CheckoutOp.class).setSource("master").call();
        insertAndAdd(points3);

        CherryPickOp cherryPick = geogig.command(CherryPickOp.class);
        cherryPick.setCommit(Suppliers.ofInstance(c1.getId()));
        exception.expect(IllegalStateException.class);
        cherryPick.call();
    }
View Full Code Here
264
265
266
267
268
269
270
271
272
273
274
275
276
    @Test
    public void testCherryPickRootCommit() throws Exception {
        insertAndAdd(points1);
        final RevCommit c1 = geogig.command(CommitOp.class).setMessage("commit for " + idP1).call();

        CherryPickOp cherryPick = geogig.command(CherryPickOp.class);
        cherryPick.setCommit(Suppliers.ofInstance(c1.getId()));
        cherryPick.call();

        Iterator<RevCommit> log = geogig.command(LogOp.class).call();

        // Commit 2
        RevCommit logC2 = log.next();
View Full Code Here
292
293
294
295
296
297
298
299
300
301
    @Test
    public void testCherryPickExistingCommit() throws Exception {
        insertAndAdd(points1);
        final RevCommit c1 = geogig.command(CommitOp.class).setMessage("commit for " + idP1).call();

        CherryPickOp cherryPick = geogig.command(CherryPickOp.class);
        cherryPick.setCommit(Suppliers.ofInstance(c1.getId()));
        exception.expect(NothingToCommitException.class);
        cherryPick.call();
    }
View Full Code Here
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
    public void runInternal(GeogigCLI cli) {
        final GeoGIG geogig = cli.getGeogig();
        checkParameter(commits.size() > 0, "No commits specified.");
        checkParameter(commits.size() < 2, "Too many commits specified.");

        CherryPickOp cherryPick = geogig.command(CherryPickOp.class);

        Optional<ObjectId> commitId;
        commitId = geogig.command(RevParse.class).setRefSpec(commits.get(0)).call();
        checkParameter(commitId.isPresent(), "Commit not found '%s'", commits.get(0));
        cherryPick.setCommit(Suppliers.ofInstance(commitId.get()));

        cherryPick.call();

    }
View Full Code Here
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
        // |
        // o - master - Points 2 added

        // switch back to master
        geogig.command(CheckoutOp.class).setSource("master").call();
        CherryPickOp cherryPick = geogig.command(CherryPickOp.class);
        cherryPick.setCommit(Suppliers.ofInstance(c5.getId()));
        RevCommit commit2 = cherryPick.call();

        assertEquals(c5.getAuthor(), commit2.getAuthor());
        assertEquals(c5.getCommitter().getName(), commit2.getCommitter().getName());
        assertEquals(c5.getMessage(), commit2.getMessage());
        assertFalse(c5.getCommitter().getTimestamp() == commit2.getCommitter().getTimestamp());
        assertFalse(c5.getTreeId().equals(commit2.getTreeId()));

        cherryPick.setCommit(Suppliers.ofInstance(c3.getId()));
        RevCommit commit3 = cherryPick.call();

        assertEquals(c3.getAuthor(), commit3.getAuthor());
        assertEquals(c3.getCommitter().getName(), commit3.getCommitter().getName());
        assertEquals(c3.getMessage(), commit3.getMessage());
        assertFalse(c3.getCommitter().getTimestamp() == commit3.getCommitter().getTimestamp());
        assertFalse(c3.getTreeId().equals(commit3.getTreeId()));

        cherryPick.setCommit(Suppliers.ofInstance(c2.getId()));
        RevCommit commit4 = cherryPick.call();

        assertEquals(c2.getAuthor(), commit4.getAuthor());
        assertEquals(c2.getCommitter().getName(), commit4.getCommitter().getName());
        assertEquals(c2.getCommitter().getEmail(), commit4.getCommitter().getEmail());
        assertEquals(c2.getMessage(), commit4.getMessage());
View Full Code Here
211
212
213
214
215
216
217
218
219
220
    }

    @Test
    public void testCherryPickInvalidCommit() throws Exception {
        CherryPickOp cherryPick = geogig.command(CherryPickOp.class);
        cherryPick.setCommit(Suppliers.ofInstance(ObjectId.NULL));
        exception.expect(IllegalArgumentException.class);
        cherryPick.call();
    }
View Full Code Here
231
232
233
234
235
236
237
238
239
240
        // checkout master and insert some features
        geogig.command(CheckoutOp.class).setSource("master").call();
        insert(points3);

        CherryPickOp cherryPick = geogig.command(CherryPickOp.class);
        cherryPick.setCommit(Suppliers.ofInstance(c1.getId()));
        exception.expect(IllegalStateException.class);
        cherryPick.call();
    }
View Full Code Here
TOP

Related Classes of org.locationtech.geogig.api.porcelain.CherryPickOp

  • org.locationtech.geogig.api.ObjectId
  • org.locationtech.geogig.api.plumbing.merge.MergeScenarioReport
  • org.locationtech.geogig.api.RevCommit
  • org.locationtech.geogig.api.SymRef
  • org.locationtech.geogig.cli.porcelain.CherryPick
  • org.locationtech.geogig.repository.Repository
  • org.locationtech.geogig.test.integration.CherryPickOpTest
    • 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.