RebaseOp rebase = geogig.command(RebaseOp.class).setSkip(skip).setContinue(continueRebase) .setAbort(abort).setSquashMessage(squash); rebase.setProgressListener(cli.getProgressListener()); .call(); checkParameter(upstreamRef.isPresent(), "The upstream reference could not be resolved."); rebase.setUpstream(Suppliers.ofInstance(upstreamRef.get().getObjectId())); Optional<ObjectId> ontoId = geogig.command(RevParse.class).setRefSpec(onto).call(); checkParameter(ontoId.isPresent(), "The onto reference could not be resolved."); rebase.setOnto(Suppliers.ofInstance(ontoId.get())); rebase.call(); } catch (RebaseConflictsException e) { StringBuilder sb = new StringBuilder();
@Test public void testContinueSkipAndAbortWhileNotInConflictedState() throws Exception { try { geogig.command(RebaseOp.class).setContinue(true).call(); fail(); } catch (IllegalStateException e) { assertTrue(e.getMessage().contains("Cannot continue")); } try { geogig.command(RebaseOp.class).setAbort(true).call(); fail(); } catch (IllegalStateException e) { assertTrue(e.getMessage().contains("Cannot abort")); } try { geogig.command(RebaseOp.class).setSkip(true).call(); fail(); } catch (IllegalStateException e) { assertTrue(e.getMessage().contains("Cannot skip")); } }
@Test public void testRebaseNoCommits() throws Exception { Optional<Ref> master = geogig.command(RefParse.class).setName("master").call(); exception.expect(IllegalStateException.class); geogig.command(RebaseOp.class).setUpstream(Suppliers.ofInstance(master.get().getObjectId())) .call(); }
geogig.command(RebaseOp.class).setUpstream(Suppliers.ofInstance(masterCommit.getId())) .call(); fail(); } catch (RebaseConflictsException e) { geogig.command(RebaseOp.class).setContinue(true).call();
geogig.command(RebaseOp.class).setUpstream(Suppliers.ofInstance(branch1.getObjectId())) .setSquashMessage("squashed commit").call(); fail(); } catch (RebaseConflictsException e) { insert(points1Merged); geogig.command(AddOp.class).call(); geogig.command(RebaseOp.class).setContinue(true).call();
geogig.command(RebaseOp.class).setUpstream(Suppliers.ofInstance(branch1.getObjectId())) .call(); fail(); } catch (RebaseConflictsException e) { geogig.command(RebaseOp.class).setAbort(true).call();
geogig.command(RebaseOp.class).setUpstream(Suppliers.ofInstance(branch1.getObjectId())) .call(); fail(); } catch (RebaseConflictsException e) { assertTrue(hasConflicts); geogig.command(RebaseOp.class).setSkip(true).call();
Optional<Ref> master = geogig.command(RefParse.class).setName("master").call(); geogig.command(RebaseOp.class).setUpstream(Suppliers.ofInstance(branch1.getObjectId())) .setOnto(Suppliers.ofInstance(master.get().getObjectId())).call();
geogig.command(RebaseOp.class).setUpstream(Suppliers.ofInstance(branch1.getObjectId())) .setSquashMessage("squashed commit").call();
if (rebase) { getProgressListener().setDescription("Rebasing updated features..."); command(RebaseOp.class).setUpstream(commitSupplier) .setProgressListener(getProgressListener()).call(); } else { getProgressListener().setDescription("Merging updated features...");
@Test public void testRebaseNoUpstream() throws Exception { exception.expect(IllegalStateException.class); geogig.command(RebaseOp.class).call(); }
@Test public void testRebaseNoCommits() throws Exception { Optional<Ref> master = geogig.command(RefParse.class).setName("master").call(); exception.expect(IllegalStateException.class); geogig.command(RebaseOp.class).setUpstream(Suppliers.ofInstance(master.get().getObjectId())) .call(); }
geogig.command(RebaseOp.class).setUpstream(Suppliers.ofInstance(masterCommit.getId())) .call(); fail(); } catch (RebaseConflictsException e) { geogig.command(RebaseOp.class).setContinue(true).call();
geogig.command(RebaseOp.class).setUpstream(Suppliers.ofInstance(branch1.getObjectId())) .setSquashMessage("squashed commit").call(); fail(); } catch (RebaseConflictsException e) { insert(points1Merged); geogig.command(AddOp.class).call(); geogig.command(RebaseOp.class).setContinue(true).call();
@Test public void testContinueSkipAndAbortWhileNotInConflictedState() throws Exception { try { geogig.command(RebaseOp.class).setContinue(true).call(); fail(); } catch (IllegalStateException e) { assertTrue(e.getMessage().contains("Cannot continue")); } try { geogig.command(RebaseOp.class).setAbort(true).call(); fail(); } catch (IllegalStateException e) { assertTrue(e.getMessage().contains("Cannot abort")); } try { geogig.command(RebaseOp.class).setSkip(true).call(); fail(); } catch (IllegalStateException e) { assertTrue(e.getMessage().contains("Cannot skip")); } }
geogig.command(RebaseOp.class).setUpstream(Suppliers.ofInstance(branch1.getObjectId())) .call(); fail(); } catch (RebaseConflictsException e) { geogig.command(RebaseOp.class).setAbort(true).call();
geogig.command(RebaseOp.class).setUpstream(Suppliers.ofInstance(branch1.getObjectId())) .call(); fail(); } catch (RebaseConflictsException e) { assertTrue(hasConflicts); geogig.command(RebaseOp.class).setSkip(true).call();
Optional<Ref> master = geogig.command(RefParse.class).setName("master").call(); geogig.command(RebaseOp.class).setUpstream(Suppliers.ofInstance(branch1.getObjectId())) .setOnto(Suppliers.ofInstance(master.get().getObjectId())).call();
geogig.command(RebaseOp.class).setUpstream(Suppliers.ofInstance(branch1.getObjectId())) .setSquashMessage("squashed commit").call();
.setProgressListener(getProgressListener()).call(); transaction.command(RebaseOp.class) .setUpstream(Suppliers.ofInstance(currentRef.get().getObjectId())) .setProgressListener(getProgressListener()).call();