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; }
protected MergeReport mergeNoFF(String branch, String mergeMessage, boolean mergeOurs) { Ref branchRef = geogig.command(RefParse.class).setName(branch).call().get(); ObjectId updatesBranchTip = branchRef.getObjectId(); MergeReport mergeReport = geogig.command(MergeOp.class)// .setMessage(mergeMessage)// .setNoFastForward(true)// .addCommit(updatesBranchTip)// .setOurs(mergeOurs)// .setTheirs(!mergeOurs)// .setProgressListener(SIMPLE_PROGRESS)// .call(); return mergeReport; }
protected MergeReport mergeNoFF(Repository repo, String branch, String mergeMessage, boolean mergeOurs) { Ref branchRef = repo.command(RefParse.class).setName(branch).call().get(); ObjectId updatesBranchTip = branchRef.getObjectId(); MergeReport mergeReport = repo.command(MergeOp.class)// .setMessage(mergeMessage)// .setNoFastForward(true)// .addCommit(updatesBranchTip)// .setOurs(mergeOurs)// .setTheirs(!mergeOurs)// .setProgressListener(SIMPLE_PROGRESS)// .call(); return mergeReport; }
protected MergeReport mergeNoFF(Repository repo, String branch, String mergeMessage, boolean mergeOurs) { Ref branchRef = repo.command(RefParse.class).setName(branch).call().get(); ObjectId updatesBranchTip = branchRef.getObjectId(); MergeReport mergeReport = repo.command(MergeOp.class)// .setMessage(mergeMessage)// .setNoFastForward(true)// .addCommit(updatesBranchTip)// .setOurs(mergeOurs)// .setTheirs(!mergeOurs)// .setProgressListener(SIMPLE_PROGRESS)// .call(); return mergeReport; }
protected MergeReport mergeNoFF(String branch, String mergeMessage, boolean mergeOurs) { Ref branchRef = geogig.command(RefParse.class).setName(branch).call().get(); ObjectId updatesBranchTip = branchRef.getObjectId(); MergeReport mergeReport = geogig.command(MergeOp.class)// .setMessage(mergeMessage)// .setNoFastForward(true)// .addCommit(updatesBranchTip)// .setOurs(mergeOurs)// .setTheirs(!mergeOurs)// .setProgressListener(SIMPLE_PROGRESS)// .call(); return mergeReport; }
@Test public void testCancelScenario2() throws Exception { // Test cancel while merging with conflicts ProgressListener listener = mock(ProgressListener.class); when(listener.isCanceled()).thenReturn(false, true); insertAndAdd(points2); geogig.command(CommitOp.class).setMessage("commit for " + idP2).call(); // create branch1 and checkout geogig.command(BranchCreateOp.class).setAutoCheckout(true).setName("branch1").call(); insertAndAdd(points1); geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); // checkout master geogig.command(CheckoutOp.class).setSource("master").call(); insertAndAdd(points1_modified); geogig.command(CommitOp.class).setMessage("commit for " + idP1 + " modified").call(); insertAndAdd(lines1); RevCommit master = 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(branch1.getObjectId()) .setMessage("My merge message.").setProgressListener(listener).call(); assertNull(mergeReport); verify(listener, times(2)).isCanceled(); verifyCancelledCleanly(master); }
@Test public void testCancelScenario2() throws Exception { // Test cancel while merging with conflicts ProgressListener listener = mock(ProgressListener.class); when(listener.isCanceled()).thenReturn(false, true); insertAndAdd(points2); geogig.command(CommitOp.class).setMessage("commit for " + idP2).call(); // create branch1 and checkout geogig.command(BranchCreateOp.class).setAutoCheckout(true).setName("branch1").call(); insertAndAdd(points1); geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); // checkout master geogig.command(CheckoutOp.class).setSource("master").call(); insertAndAdd(points1_modified); geogig.command(CommitOp.class).setMessage("commit for " + idP1 + " modified").call(); insertAndAdd(lines1); RevCommit master = 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(branch1.getObjectId()) .setMessage("My merge message.").setProgressListener(listener).call(); assertNull(mergeReport); verify(listener, times(2)).isCanceled(); verifyCancelledCleanly(master); }
@Test public void testCancelScenario3() throws Exception { // Test cancel during non-conflicting merge ProgressListener listener = mock(ProgressListener.class); when(listener.isCanceled()).thenReturn(false, true); insertAndAdd(points1); geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); // create branch1 and checkout geogig.command(BranchCreateOp.class).setAutoCheckout(true).setName("branch1").call(); insertAndAdd(points2); geogig.command(CommitOp.class).setMessage("commit for " + idP2).call(); // checkout master geogig.command(CheckoutOp.class).setSource("master").call(); insertAndAdd(points3); geogig.command(CommitOp.class).setMessage("commit for " + idP3).call(); insertAndAdd(lines1); RevCommit master = 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(branch1.getObjectId()) .setMessage("My merge message.").setProgressListener(listener).call(); assertNull(mergeReport); verify(listener, times(2)).isCanceled(); verifyCancelledCleanly(master); }
@Test public void testCancelScenario3() throws Exception { // Test cancel during non-conflicting merge ProgressListener listener = mock(ProgressListener.class); when(listener.isCanceled()).thenReturn(false, true); insertAndAdd(points1); geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); // create branch1 and checkout geogig.command(BranchCreateOp.class).setAutoCheckout(true).setName("branch1").call(); insertAndAdd(points2); geogig.command(CommitOp.class).setMessage("commit for " + idP2).call(); // checkout master geogig.command(CheckoutOp.class).setSource("master").call(); insertAndAdd(points3); geogig.command(CommitOp.class).setMessage("commit for " + idP3).call(); insertAndAdd(lines1); RevCommit master = 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(branch1.getObjectId()) .setMessage("My merge message.").setProgressListener(listener).call(); assertNull(mergeReport); verify(listener, times(2)).isCanceled(); verifyCancelledCleanly(master); }
@Test public void testCancelScenario1() throws Exception { // Test cancel before merge work begins ProgressListener listener = mock(ProgressListener.class); when(listener.isCanceled()).thenReturn(true); insertAndAdd(points1); geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); // create branch1 and checkout geogig.command(BranchCreateOp.class).setAutoCheckout(true).setName("branch1").call(); insertAndAdd(points2); geogig.command(CommitOp.class).setMessage("commit for " + idP2).call(); // checkout master geogig.command(CheckoutOp.class).setSource("master").call(); insertAndAdd(points3); geogig.command(CommitOp.class).setMessage("commit for " + idP3).call(); insertAndAdd(lines1); RevCommit master = 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(branch1.getObjectId()) .setMessage("My merge message.").setProgressListener(listener).call(); assertNull(mergeReport); verify(listener, times(1)).isCanceled(); verifyCancelledCleanly(master); }
@Test public void testCancelScenario1() throws Exception { // Test cancel before merge work begins ProgressListener listener = mock(ProgressListener.class); when(listener.isCanceled()).thenReturn(true); insertAndAdd(points1); geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); // create branch1 and checkout geogig.command(BranchCreateOp.class).setAutoCheckout(true).setName("branch1").call(); insertAndAdd(points2); geogig.command(CommitOp.class).setMessage("commit for " + idP2).call(); // checkout master geogig.command(CheckoutOp.class).setSource("master").call(); insertAndAdd(points3); geogig.command(CommitOp.class).setMessage("commit for " + idP3).call(); insertAndAdd(lines1); RevCommit master = 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(branch1.getObjectId()) .setMessage("My merge message.").setProgressListener(listener).call(); assertNull(mergeReport); verify(listener, times(1)).isCanceled(); verifyCancelledCleanly(master); }
Ref branch1 = geogig.command(RefParse.class).setName("branch1").call().get(); geogig.command(MergeOp.class).addCommit(branch1.getObjectId()) .setMessage("My merge message.").call(); geogig.command(SquashOp.class).setSince(c3).setUntil(c4).setMessage("Squashed").call();
try { geogig.command(MergeOp.class).addCommit(branch.getObjectId()) .setMessage("Merge features.").call(); fail(); } catch (MergeConflictsException e) {
try { geogig.command(MergeOp.class).addCommit(branch.getObjectId()) .setMessage("Merge features.").call(); fail(); } catch (MergeConflictsException e) {
final MergeReport mergeReport = geogig.command(MergeOp.class) .addCommit(branch1.getObjectId()).addCommit(branch2.getObjectId()) .setMessage("My merge message.").setProgressListener(listener).call();
final MergeReport mergeReport = geogig.command(MergeOp.class) .addCommit(branch1.getObjectId()).addCommit(branch2.getObjectId()) .setMessage("My merge message.").setProgressListener(listener).call();
.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());
Ref branch1 = geogig.command(RefParse.class).setName("branch1").call().get(); MergeReport mergeReport = geogig.command(MergeOp.class).addCommit(branch1.getObjectId()) .setMessage("My merge message.").call(); try { geogig.command(SquashOp.class).setSince(c2).setUntil(mergeReport.getMergeCommit())