@Override public void write(ResponseWriter out) throws Exception { out.start(); out.writeMergeResponse(Optional.fromNullable(report.getMergeCommit()), report.getReport().get(), report.getOurs(), report.getPairs().get(0).getTheirs(), report.getPairs().get(0).getAncestor()); out.finish(); } });
@Override public void write(ResponseWriter out) throws Exception { out.start(); out.writeMergeResponse(Optional.fromNullable(report.getMergeCommit()), report.getReport().get(), report.getOurs(), report.getPairs().get(0).getTheirs(), report.getPairs().get(0).getAncestor()); out.finish(); } });
&& result.getMergeReport().get().getReport().isPresent()) { MergeReport report = result.getMergeReport().get(); writeMergeResponse(Optional.fromNullable(report.getMergeCommit()), report.getReport().get(), report.getOurs(), report.getPairs().get(0).getTheirs(), report.getPairs().get(0).getAncestor());
.setCommit(Suppliers.ofInstance(merge2_left.getMergeCommit().getId())).call(); .setCommit(Suppliers.ofInstance(merge2_right.getMergeCommit().getId())).call();
.setLeft(mergeReport.getMergeCommit()).setRight(branch2).call();
.addCommit(branch1.getObjectId()).call(); RevTree mergedTree = repo.getTree(mergeReport.getMergeCommit().getTreeId());
.addCommit(branch1.getObjectId()).call(); RevTree mergedTree = repo.getTree(mergeReport.getMergeCommit().getTreeId());
.setMessage("My merge message.").call(); try { geogig.command(SquashOp.class).setSince(c1).setUntil(mergeReport.getMergeCommit()) .setMessage("Squashed").call(); fail();
.setMessage("My merge message.").call(); try { geogig.command(SquashOp.class).setSince(c2).setUntil(mergeReport.getMergeCommit()) .setMessage("Squashed").call(); } catch (IllegalArgumentException e) {
.setMessage("My merge message.").call(); try { geogig.command(SquashOp.class).setSince(c1).setUntil(mergeReport.getMergeCommit()) .setMessage("Squashed").call(); fail();
.addCommit(branch1.getObjectId()).call(); RevTree mergedTree = repo.getTree(mergeReport.getMergeCommit().getTreeId());
MergeReport mergeReport = geogig.command(MergeOp.class).addCommit(branch1.getObjectId()) .setMessage("My merge message.").call(); geogig.command(SquashOp.class).setSince(c3).setUntil(mergeReport.getMergeCommit()) .setMessage("Squashed").call(); ArrayList<RevCommit> log = Lists
MergeReport mergeReport = geogig.command(MergeOp.class).addCommit(branch1.getObjectId()) .setMessage("My merge message.").call(); geogig.command(SquashOp.class).setSince(c3).setUntil(mergeReport.getMergeCommit()) .setMessage("Squashed").call(); ArrayList<RevCommit> log = Lists
.setMessage("My merge message.").call(); try { geogig.command(SquashOp.class).setSince(c2).setUntil(mergeReport.getMergeCommit()) .setMessage("Squashed").call(); } catch (IllegalArgumentException e) {
.setMessage("merged branch1").call(); featureTree = IndexUtils.resolveTypeTreeRef(geogig.getContext(), report.getMergeCommit().getId() + ":" + worldPointsLayer.getName());
.setMessage("merged branch1").call(); featureTree = IndexUtils.resolveTypeTreeRef(geogig.getContext(), report.getMergeCommit().getId() + ":" + worldPointsLayer.getName());
.addCommit(branch1.getObjectId()).call(); RevTree mergedTree = repo.getTree(mergeReport.getMergeCommit().getTreeId());
public @Test void healthCheckTestMergeDoneButOutDated() { // fake PRPrepareOp fakeUpToDate(); GeogigTransaction tx = request.getTransaction(origin.getRepo().context()); tx.command(UpdateRef.class).setName("refs/heads/" + request.getTargetBranch()) .setNewValue(origin.getRef(request.getTargetBranch()).getObjectId()); tx.command(CheckoutOp.class).setSource(request.getTargetBranch()).call(); tx.command(ResetOp.class).setCommit(origin.getRef(request.getTargetBranch()).getObjectId()) .setMode(ResetMode.HARD).call(); ObjectId localRemoteCommit = clone.getRef(request.getRemoteBranch()).getObjectId(); RevCommit merge = tx.command(MergeOp.class).addCommit(localRemoteCommit).call() .getMergeCommit(); tx.command(UpdateRef.class).setName(request.getMergeRef()).setNewValue(merge.getId()) .call(); origin.checkout("master").insert(TestData.line2).add().commit("ahead commit"); PRStatus status = origin.getRepo().command(PRHealthCheckOp.class).setId(request.getId()) .call(); assertNotNull(status); assertEquals(request, status.getRequest()); assertEquals(Sets.newHashSet("Lines", "Points", "Polygons"), Sets.newHashSet(status.getAffectedLayers())); Optional<ObjectId> mergeCommit = status.getMergeCommit(); assertTrue(mergeCommit.toString(), mergeCommit.isPresent()); assertEquals(0, status.getCommitsBehindRemoteBranch()); assertEquals(1, status.getCommitsBehindTargetBranch()); assertEquals(0, status.getNumConflicts()); }
public TestData mergeNoFF(String branchToMerge, String mergeCommitMessage) { ObjectId branchHead = getContext().command(RefParse.class).setName(branchToMerge).call() .get().getObjectId(); MergeReport report = getContext().command(MergeOp.class).setNoFastForward(true) .setMessage(mergeCommitMessage).addCommit(branchHead).call(); RevCommit mergeCommit = report.getMergeCommit(); checkState(mergeCommit.getParentIds().size() == 2); LOG.debug(mergeCommit.toString()); return this; }
public TestData mergeNoFF(String branchToMerge, String mergeCommitMessage) { ObjectId branchHead = getContext().command(RefParse.class).setName(branchToMerge).call() .get().getObjectId(); MergeReport report = getContext().command(MergeOp.class).setNoFastForward(true) .setMessage(mergeCommitMessage).addCommit(branchHead).call(); RevCommit mergeCommit = report.getMergeCommit(); checkState(mergeCommit.getParentIds().size() == 2); LOG.debug(mergeCommit.toString()); return this; }