Package org.locationtech.geogig.api.porcelain.MergeOp

Examples of org.locationtech.geogig.api.porcelain.MergeOp.MergeReport

275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
        // .\|/
        // . o - master - HEAD - Merge commit

        Ref branch1 = geogig.command(RefParse.class).setName("branch1").call().get();
        Ref branch2 = geogig.command(RefParse.class).setName("branch2").call().get();
        final MergeReport mergeReport = geogig.command(MergeOp.class)
                .addCommit(Suppliers.ofInstance(branch1.getObjectId()))
                .addCommit(Suppliers.ofInstance(branch2.getObjectId()))
                .setMessage("My merge message.").call();

        RevTree mergedTree = repo.getTree(mergeReport.getMergeCommit().getTreeId());

        String path = appendChild(pointsName, points1.getIdentifier().getID());
        assertTrue(repo.command(FindTreeChild.class).setParent(mergedTree).setChildPath(path)
                .call().isPresent());
View Full Code Here
376
377
378
379
380
381
382
383
384
385
386
387
388
389
        // o | - Lines 1 added
        // |/
        // o - master - HEAD - Merge commit

        Ref branch1 = geogig.command(RefParse.class).setName("branch1").call().get();
        final MergeReport mergeReport = geogig.command(MergeOp.class)
                .addCommit(Suppliers.ofInstance(branch1.getObjectId())).call();

        RevTree mergedTree = repo.getTree(mergeReport.getMergeCommit().getTreeId());

        String path = appendChild(pointsName, points2.getIdentifier().getID());
        assertTrue(repo.command(FindTreeChild.class).setParent(mergedTree).setChildPath(path)
                .call().isPresent());
View Full Code Here
497
498
499
500
501
502
503
504
505
506
507
508
509
510
        // o - Points 1 added
        // |
        // o - master - HEAD - branch1 - Points 2 added

        Ref branch1 = geogig.command(RefParse.class).setName("branch1").call().get();
        final MergeReport mergeReport = geogig.command(MergeOp.class)
                .addCommit(Suppliers.ofInstance(branch1.getObjectId())).call();

        RevTree mergedTree = repo.getTree(mergeReport.getMergeCommit().getTreeId());

        String path = appendChild(pointsName, points1.getIdentifier().getID());
        assertTrue(repo.command(FindTreeChild.class).setParent(mergedTree).setChildPath(path)
                .call().isPresent());
View Full Code Here
553
554
555
556
557
558
559
560
561
562
563
564
565
566
        // o
        // |
        // o - master - HEAD - branch1 - Points 1 added

        Ref branch1 = geogig.command(RefParse.class).setName("branch1").call().get();
        final MergeReport mergeReport = geogig.command(MergeOp.class)
                .addCommit(Suppliers.ofInstance(branch1.getObjectId())).call();

        RevTree mergedTree = repo.getTree(mergeReport.getMergeCommit().getTreeId());

        String path = appendChild(pointsName, points1.getIdentifier().getID());
        assertTrue(repo.command(FindTreeChild.class).setParent(mergedTree).setChildPath(path)
                .call().isPresent());
View Full Code Here
255
256
257
258
259
260
261
262
263
264
265
                    if (rebase) {
                        command(RebaseOp.class).setUpstream(
                                Suppliers.ofInstance(sourceRef.get().getObjectId())).call();
                    } else {
                        try {
                            MergeReport report = command(MergeOp.class)
                                    .setAuthor(authorName.orNull(), authorEmail.orNull())
                                    .addCommit(Suppliers.ofInstance(sourceRef.get().getObjectId()))
                                    .call();
                            result.setMergeReport(Optional.of(report));
                        } catch (NothingToCommitException e) {
View Full Code Here
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
        geogig.command(CheckoutOp.class).setSource("master").call();
        insertAndAdd(lines1);
        @SuppressWarnings("unused")
        final RevCommit c4 = geogig.command(CommitOp.class).setMessage("commit for " + idL1).call();
        Ref branch1 = geogig.command(RefParse.class).setName("branch1").call().get();
        MergeReport mergeReport = geogig.command(MergeOp.class)
                .addCommit(Suppliers.ofInstance(branch1.getObjectId()))
                .setMessage("My merge message.").call();
        try {
            geogig.command(SquashOp.class).setSince(c2).setUntil(mergeReport.getMergeCommit())
                    .setMessage("Squashed").call();
        } catch (IllegalArgumentException e) {
            assertTrue(e.getMessage().equals(
                    "Cannot reach 'since' from 'until' commit through first parentage"));
        }
View Full Code Here
294
295
296
297
298
299
300
301
302
303
304
305
306
307
        final RevCommit c3 = geogig.command(CommitOp.class).setMessage("commit for " + idP3).call();
        insertAndAdd(lines1);
        @SuppressWarnings("unused")
        final RevCommit c4 = geogig.command(CommitOp.class).setMessage("commit for " + idL1).call();
        Ref branch1 = geogig.command(RefParse.class).setName("branch1").call().get();
        MergeReport mergeReport = geogig.command(MergeOp.class)
                .addCommit(Suppliers.ofInstance(branch1.getObjectId()))
                .setMessage("My merge message.").call();
        geogig.command(SquashOp.class).setSince(c3).setUntil(mergeReport.getMergeCommit())
                .setMessage("Squashed").call();
        ArrayList<RevCommit> log = Lists.newArrayList(geogig.command(LogOp.class)
                .setFirstParentOnly(true).call());
        assertEquals(2, log.size());
        ImmutableList<ObjectId> parents = log.get(0).getParentIds();
View Full Code Here
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
        final RevCommit c3 = geogig.command(CommitOp.class).setMessage("commit for " + idP3).call();
        insertAndAdd(lines1);
        @SuppressWarnings("unused")
        final RevCommit c4 = geogig.command(CommitOp.class).setMessage("commit for " + idL1).call();
        Ref branch1 = geogig.command(RefParse.class).setName("branch1").call().get();
        MergeReport mergeReport = geogig.command(MergeOp.class)
                .addCommit(Suppliers.ofInstance(branch1.getObjectId()))
                .setMessage("My merge message.").call();
        try {
            geogig.command(SquashOp.class).setSince(c1).setUntil(mergeReport.getMergeCommit())
                    .setMessage("Squashed").call();
            fail();
        } catch (IllegalArgumentException e) {
            assertTrue(e
                    .getMessage()
View Full Code Here
109
110
111
112
113
114
115
116
117
118
119
120
                Optional<ObjectId> commitId;
                commitId = geogig.command(RevParse.class).setRefSpec(commitish).call();
                checkParameter(commitId.isPresent(), "Commit not found '%s'", commitish);
                merge.addCommit(Suppliers.ofInstance(commitId.get()));
            }
            MergeReport report = merge.call();
            commit = report.getMergeCommit();
        } catch (RuntimeException e) {
            if (e instanceof NothingToCommitException || e instanceof IllegalArgumentException
                    || e instanceof IllegalStateException) {
                throw new CommandFailedException(e.getMessage(), e);
            }
View Full Code Here
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
        merge.setAuthor(authorName.orNull(), authorEmail.orNull());
        merge.addCommit(Suppliers.ofInstance(mapped.getId()));
        merge.setMessage(mergeMessage.or("Merged revert of " + featurePath));

        try {
            final MergeReport report = merge.call();

            context.setResponseContent(new CommandResponse() {
                @Override
                public void write(ResponseWriter out) throws Exception {
                    out.start();
                    out.writeMergeResponse(Optional.fromNullable(report.getMergeCommit()), report
                            .getReport().get(), geogig, report.getOurs(), report.getPairs().get(0)
                            .getTheirs(), report.getPairs().get(0).getAncestor());
                    out.finish();
                }
            });
        } catch (Exception e) {
            final RevCommit ours = context.getGeoGIG().getRepository()
View Full Code Here
TOP

Related Classes of org.locationtech.geogig.api.porcelain.MergeOp.MergeReport

  • org.locationtech.geogig.api.porcelain.PullOp
  • org.locationtech.geogig.cli.porcelain.Merge
  • org.locationtech.geogig.test.integration.CloneOpTest
  • org.locationtech.geogig.test.integration.FindCommonAncestorTest
  • org.locationtech.geogig.test.integration.LogOpTest
  • org.locationtech.geogig.test.integration.MergeOpTest
  • org.locationtech.geogig.test.integration.SparseCloneTest
  • org.locationtech.geogig.test.integration.SquashOpTest
  • org.locationtech.geogig.web.api.commands.MergeWebOp
  • org.locationtech.geogig.web.api.commands.RevertFeatureWebOp
    • 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.