Examples of org.locationtech.geogig.api.porcelain.MergeOp$CommitAncestorPair

Package org.locationtech.geogig.api.porcelain

Examples of org.locationtech.geogig.api.porcelain.MergeOp$CommitAncestorPair

org.locationtech.geogig.api.porcelain.MergeOp
Merge two or more histories together.

                    .setObjectId(oId).call();
            assertTrue(childObject.isPresent());
        }


        // Merge master into Branch1
        MergeOp merge = localGeogig.geogig.command(MergeOp.class);
        MergeReport report = merge.addCommit(Suppliers.ofInstance(masterCommit))
                .setMessage("Merge").call();


        // Update master to the new merge commit
        localGeogig.geogig.command(UpdateRef.class).setName("refs/heads/master")
                .setNewValue(report.getMergeCommit().getId()).call();

View Full Code Here


        // Checkout master
        localGeogig.geogig.command(CheckoutOp.class).setSource("master").call();


        // Merge Branch1 into master
        MergeOp merge = localGeogig.geogig.command(MergeOp.class);
        MergeReport report = merge.addCommit(Suppliers.ofInstance(expected.get(0).getId()))
                .setMessage("Merge").call();


        PushOp push = push();
        push.addRefSpec("refs/heads/master").call();

View Full Code Here


        // Now try to merge all branches into master
        geogig.command(CheckoutOp.class).setSource("master").call();
        Ref branch1 = geogig.command(RefParse.class).setName("branch1").call().get();
        Ref branch2 = geogig.command(RefParse.class).setName("branch2").call().get();
        MergeOp mergeOp = geogig.command(MergeOp.class);
        mergeOp.addCommit(Suppliers.ofInstance(branch1.getObjectId()));
        mergeOp.addCommit(Suppliers.ofInstance(branch2.getObjectId()));
        try {
            mergeOp.call();
            fail();
        } catch (IllegalStateException e) {
            assertTrue(e.getMessage().contains(
                    "Cannot merge more than two commits when conflicts exist"));
        }

View Full Code Here

        Feature points1ModifiedB = feature(pointsType, idP1, "StringProp1_3", new Integer(2000),
                "POINT(1 1)");
        insertAndAdd(points1ModifiedB);
        RevCommit branch6 = geogig.command(CommitOp.class).call();
        geogig.command(CheckoutOp.class).setSource("master").call();
        MergeOp mergeOp = geogig.command(MergeOp.class)
                .addCommit(Suppliers.ofInstance(branch1.getId()))
                .addCommit(Suppliers.ofInstance(branch2.getId()))
                .addCommit(Suppliers.ofInstance(branch3.getId()))
                .addCommit(Suppliers.ofInstance(branch4.getId()))
                .addCommit(Suppliers.ofInstance(branch5.getId()))
                .addCommit(Suppliers.ofInstance(branch6.getId()));
        try {
            mergeOp.call();
            fail();
        } catch (IllegalStateException e) {
            assertTrue(e.getMessage().contains(
                    "Cannot merge more than two commits when conflicts exist"));
        }

View Full Code Here

            return;
        }


        RevCommit commit;
        try {
            MergeOp merge = geogig.command(MergeOp.class);
            merge.setOurs(ours).setTheirs(theirs).setNoCommit(noCommit);
            merge.setMessage(message).setProgressListener(cli.getProgressListener());
            for (String commitish : commits) {
                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

        final Optional<Ref> currHead = geogig.command(RefParse.class).setName(Ref.HEAD).call();
        if (!currHead.isPresent()) {
            throw new CommandSpecException("Repository has no HEAD, can't merge.");
        }


        MergeOp merge = geogig.command(MergeOp.class);
        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();

View Full Code Here

        final Optional<Ref> currHead = transaction.command(RefParse.class).setName(Ref.HEAD).call();
        if (!currHead.isPresent()) {
            throw new CommandSpecException("Repository has no HEAD, can't merge.");
        }


        MergeOp merge = transaction.command(MergeOp.class);
        merge.setAuthor(authorName.orNull(), authorEmail.orNull());


        final Optional<ObjectId> oid = transaction.command(RevParse.class).setRefSpec(commit)
                .call();
        if (oid.isPresent()) {
            merge.addCommit(Suppliers.ofInstance(oid.get()));
        } else {
            throw new CommandSpecException("Couldn't resolve '" + commit + "' to a commit.");
        }


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


            context.setResponseContent(new CommandResponse() {
                @Override
                public void write(ResponseWriter out) throws Exception {
                    out.start();

View Full Code Here

TOP

Related Classes of org.locationtech.geogig.api.porcelain.MergeOp$CommitAncestorPair

org.locationtech.geogig.api.ObjectId

org.locationtech.geogig.api.ProgressListener

org.locationtech.geogig.api.Ref

org.locationtech.geogig.api.RevCommit

org.locationtech.geogig.api.SubProgressListener

org.locationtech.geogig.api.SymRef

org.locationtech.geogig.cli.porcelain.Merge

org.locationtech.geogig.test.integration.MergeOpTest

org.locationtech.geogig.test.integration.SparseCloneTest

org.locationtech.geogig.web.api.commands.MergeWebOp

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.