Examples of org.locationtech.geogig.api.Ref

org.locationtech.geogig.api.Ref
Pairing of a name and the {@link ObjectId} it currently has.
A ref in Git is (more or less) a variable that holds a single object identifier. The object identifier can be any valid Git object (blob, tree, commit, annotated tag, ...).
The ref name has the attributes of the ref that was asked for as well as the ref it was resolved to for symbolic refs plus the object id it points to and (for tags) the peeled target object id, i.e. the tag resolved recursively until a non-tag object is referenced.

        // | |
        // o | - Lines 1 added
        // |/
        // o - master - HEAD - Merge commit


        Ref branch1 = geogig.command(RefParse.class).setName("branch1").call().get();
        geogig.command(MergeOp.class).setAuthor("Merge Author", "merge@author.com")
                .addCommit(Suppliers.ofInstance(branch1.getObjectId()))
                .setMessage("My merge message.").call();


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


        // Merge Commit

View Full Code Here

        // | | |
        // | o | - Lines 2 added
        // .\|/
        // . 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());

View Full Code Here

        // | |
        // 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)

View Full Code Here

        // | |
        // o | - Points 3 added
        // |/
        // o - master - HEAD - Merge commit


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


        exception.expect(NothingToCommitException.class);
        geogig.command(MergeOp.class).addCommit(Suppliers.ofInstance(branch1.getObjectId())).call();
    }

View Full Code Here

        // |
        // 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)

View Full Code Here

        // Merge branch1 into master to create the following revision graph
        // 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)

View Full Code Here

        delete(points2);
        geogig.command(AddOp.class).call();
        RevCommit branchCommit = geogig.command(CommitOp.class).call();
        // Now try to merge branch into master
        geogig.command(CheckoutOp.class).setSource("master").call();
        Ref branch = geogig.command(RefParse.class).setName("TestBranch").call().get();
        try {
            geogig.command(MergeOp.class).addCommit(Suppliers.ofInstance(branch.getObjectId()))
                    .call();
            fail();
        } catch (MergeConflictsException e) {
            assertTrue(e.getMessage().contains("conflict"));
        }


        Optional<Ref> ref = geogig.command(RefParse.class).setName(Ref.ORIG_HEAD).call();
        assertTrue(ref.isPresent());
        assertEquals(masterCommit.getId(), ref.get().getObjectId());
        ref = geogig.command(RefParse.class).setName(Ref.MERGE_HEAD).call();
        assertTrue(ref.isPresent());
        assertEquals(branch.getObjectId(), ref.get().getObjectId());


        String msg = geogig.command(ReadMergeCommitMessageOp.class).call();
        assertFalse(Strings.isNullOrEmpty(msg));


        List<Conflict> conflicts = geogig.command(ConflictsReadOp.class).call();

View Full Code Here

        insertAndAdd(points1ModifiedB);
        geogig.command(CommitOp.class).call();


        // 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(

View Full Code Here

        insertAndAdd(points1ModifiedB);
        insertAndAdd(points2);
        geogig.command(CommitOp.class).call();


        geogig.command(CheckoutOp.class).setSource("master").call();
        Ref branch = geogig.command(RefParse.class).setName("TestBranch").call().get();
        geogig.command(MergeOp.class).addCommit(Suppliers.ofInstance(branch.getObjectId()))
                .setOurs(true).call();


        String path = NodeRef.appendChild(pointsName, idP1);
        Optional<RevFeature> revFeature = geogig.command(RevObjectParse.class)
                .setRefSpec(Ref.HEAD + ":" + path).call(RevFeature.class);

View Full Code Here

                "POINT(1 1)");
        insertAndAdd(points1ModifiedB);
        geogig.command(CommitOp.class).call();


        geogig.command(CheckoutOp.class).setSource("master").call();
        Ref branch = geogig.command(RefParse.class).setName("TestBranch").call().get();
        geogig.command(MergeOp.class).addCommit(Suppliers.ofInstance(branch.getObjectId()))
                .setTheirs(true).call();


        String path = NodeRef.appendChild(pointsName, idP1);
        Optional<RevFeature> revFeature = geogig.command(RevObjectParse.class)
                .setRefSpec(Ref.HEAD + ":" + path).call(RevFeature.class);

View Full Code Here

0 1 2 3 4 5 6 7 8

TOP

Related Classes of org.locationtech.geogig.api.Ref

org.locationtech.geogig.api.plumbing.ForEachRef

org.locationtech.geogig.api.plumbing.RefParse

org.locationtech.geogig.api.plumbing.TransactionEnd

org.locationtech.geogig.api.plumbing.UpdateSymRefTest

org.locationtech.geogig.api.porcelain.BranchDeleteOp

org.locationtech.geogig.api.porcelain.CheckoutOp

org.locationtech.geogig.api.porcelain.CommitOp

org.locationtech.geogig.api.porcelain.FetchOp

org.locationtech.geogig.api.porcelain.InitOpTest

org.locationtech.geogig.api.porcelain.MergeOp

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.