RevCommit newCommit = command(CommitOp.class).setCommit(commitToApply).call();
@Test public void testCommitUsingCommit() throws Exception { insertAndAdd(points1); final RevCommit commit = geogig.command(CommitOp.class) .setCommitter("anothercommitter", "anothercommitter@boundlessgeo.com").call(); insertAndAdd(points2); RevCommit commit2 = geogig.command(CommitOp.class).setCommit(commit).call(); assertEquals(commit.getMessage(), commit2.getMessage()); assertEquals(commit.getAuthor(), commit2.getAuthor()); assertNotSame(commit.getCommitter(), commit2.getCommitter()); }
checkParameter(TYPE.COMMIT.equals(type), "Provided reference does not resolve to a commit"); commitOp.setCommit(geogig.getRepository().getCommit(commitId.get()));
@Test public void testCommitUsingCommit() throws Exception { insertAndAdd(points1); final RevCommit commit = geogig.command(CommitOp.class) .setCommitter("anothercommitter", "anothercommitter@boundlessgeo.com").call(); insertAndAdd(points2); RevCommit commit2 = geogig.command(CommitOp.class).setCommit(commit).call(); assertEquals(commit.getMessage(), commit2.getMessage()); assertEquals(commit.getAuthor(), commit2.getAuthor()); assertNotSame(commit.getCommitter(), commit2.getCommitter()); }
checkParameter(TYPE.COMMIT.equals(type), "Provided reference does not resolve to a commit"); commitOp.setCommit(geogig.getRepository().getCommit(commitId.get()));
RevCommit newCommit = command(CommitOp.class).setCommit(commitToApply).call();
@Test public void testCommitUsingCommitAndMessage() throws Exception { String message = "A message"; insertAndAdd(points1); final RevCommit commit = geogig.command(CommitOp.class) .setCommitter("anothercommitter", "anothercommitter@boundlessgeo.com").call(); insertAndAdd(points2); RevCommit commit2 = geogig.command(CommitOp.class).setCommit(commit).setMessage(message) .call(); assertNotSame(commit.getMessage(), commit2.getMessage()); assertEquals(commit.getAuthor(), commit2.getAuthor()); assertNotSame(commit.getCommitter(), commit2.getCommitter()); assertEquals(message, commit2.getMessage()); }
checkParameter(TYPE.COMMIT.equals(type), "Provided reference does not resolve to a commit"); commitOp.setCommit(geogig.getRepository().getCommit(commitId.get()));
insert(points1Solved); geogig.command(AddOp.class).call(); geogig.command(CommitOp.class).setCommit(branchCommit).call(); Optional<RevObject> ptsSolved = geogig.command(RevObjectParse.class) .setRefSpec(Ref.WORK_HEAD + ":" + NodeRef.appendChild(pointsName, idP1)).call();
@Test public void testCommitUsingCommitAndMessage() throws Exception { String message = "A message"; insertAndAdd(points1); final RevCommit commit = geogig.command(CommitOp.class) .setCommitter("anothercommitter", "anothercommitter@boundlessgeo.com").call(); insertAndAdd(points2); RevCommit commit2 = geogig.command(CommitOp.class).setCommit(commit).setMessage(message) .call(); assertNotSame(commit.getMessage(), commit2.getMessage()); assertEquals(commit.getAuthor(), commit2.getAuthor()); assertNotSame(commit.getCommitter(), commit2.getCommitter()); assertEquals(message, commit2.getMessage()); }
insert(points1Solved); geogig.command(AddOp.class).call(); geogig.command(CommitOp.class).setCommit(branchCommit).call(); Optional<RevObject> ptsSolved = geogig.command(RevObjectParse.class) .setRefSpec(Ref.WORK_HEAD + ":" + NodeRef.appendChild(pointsName, idP1)).call();
@Test public void testAmendReUseCommit() throws Exception { final ObjectId id = insertAndAdd(points1); final RevCommit commit1 = geogig.command(CommitOp.class).setMessage("Message").call(); { assertCommit(commit1, null, null, null); assertEquals(id, repo.getRootTreeChild(appendChild(pointsName, idP1)).get().getObjectId()); assertNotNull(repo.objectDatabase().get(id)); } final RevCommit commit2 = geogig.command(CommitOp.class).setAmend(true).setCommit(commit1) .call(); { assertCommit(commit2, null, "groldan", "Message"); Optional<RevFeature> p1 = geogig.command(RevObjectParse.class) .setRefSpec("HEAD:" + appendChild(pointsName, idP1)).call(RevFeature.class); assertTrue(p1.isPresent()); assertEquals(id, p1.get().getId()); assertEquals(commit1.getAuthor(), commit2.getAuthor()); assertEquals(commit1.getCommitter().getName(), commit2.getCommitter().getName()); assertEquals(commit1.getCommitter().getEmail(), commit2.getCommitter().getEmail()); assertEquals(commit1.getMessage(), commit2.getMessage()); assertEquals(commit1.getParentIds(), commit2.getParentIds()); assertEquals(commit1.getTreeId(), commit2.getTreeId()); } Iterator<RevCommit> log = geogig.command(LogOp.class).call(); assertTrue(log.hasNext()); log.next(); assertFalse(log.hasNext()); }
@Test public void testAmendReUseCommit() throws Exception { final ObjectId id = insertAndAdd(points1); final RevCommit commit1 = geogig.command(CommitOp.class).setMessage("Message").call(); { assertCommit(commit1, null, null, null); assertEquals(id, repo.getRootTreeChild(appendChild(pointsName, idP1)).get().getObjectId()); assertNotNull(repo.objectDatabase().get(id)); } final RevCommit commit2 = geogig.command(CommitOp.class).setAmend(true).setCommit(commit1) .call(); { assertCommit(commit2, null, "groldan", "Message"); Optional<RevFeature> p1 = geogig.command(RevObjectParse.class) .setRefSpec("HEAD:" + appendChild(pointsName, idP1)).call(RevFeature.class); assertTrue(p1.isPresent()); assertEquals(id, p1.get().getId()); assertEquals(commit1.getAuthor(), commit2.getAuthor()); assertEquals(commit1.getCommitter().getName(), commit2.getCommitter().getName()); assertEquals(commit1.getCommitter().getEmail(), commit2.getCommitter().getEmail()); assertEquals(commit1.getMessage(), commit2.getMessage()); assertEquals(commit1.getParentIds(), commit2.getParentIds()); assertEquals(commit1.getTreeId(), commit2.getTreeId()); } Iterator<RevCommit> log = geogig.command(LogOp.class).call(); assertTrue(log.hasNext()); log.next(); assertFalse(log.hasNext()); }