public GeopkgMergeConflictsException(MergeConflictsException e, GeopkgImportResult importResult) { super(e.getMessage(), e.getOurs(), e.getTheirs(), e.getReport()); super.initCause(e); this.importResult = importResult; }
/** * Executes the Version operation. * * @return the version info of the current build * @see org.locationtech.geogig.repository.AbstractGeoGigOp#call() */ protected VersionInfo _call() { return get(); }
@Test public void BranchIsHeadTest() throws Exception { insertAndAdd(points1); geogig.command(AddOp.class).call(); geogig.command(CommitOp.class).call(); geogig.command(BranchCreateOp.class).setName("TestMasterBranch").call(); geogig.command(BranchCreateOp.class).setName("TestBranch").call(); geogig.command(CheckoutOp.class).setSource("TestBranch").call(); insertAndAdd(points2); geogig.command(AddOp.class).call(); geogig.command(CommitOp.class).call(); exception.expect(IllegalArgumentException.class); geogig.command(BranchDeleteOp.class).setName("TestBranch").call(); }
private void verifyCancelledCleanly(RevCommit oldHeadCommit) { StatusSummary summary = geogig.command(StatusOp.class).call(); assertEquals(0, summary.getCountConflicts()); assertEquals(0, summary.getCountStaged()); assertEquals(0, summary.getCountUnstaged()); Iterator<RevCommit> log = geogig.command(LogOp.class).call(); assertTrue(log.hasNext()); assertEquals(oldHeadCommit, log.next()); }
@Override public AutoCloseableIterator<DiffEntry> iterator() { return call(); }
public GeopkgMergeConflictsException(MergeConflictsException e, GeopkgImportResult importResult) { super(e.getMessage(), e.getOurs(), e.getTheirs()); this.importResult = importResult; }
private String resolveCommitter() { if (committerName != null) { return committerName; } final String namekey = "user.name"; String name = getClientData(namekey, String.class) .or(command(ConfigGet.class).setName(namekey).call()).orNull(); checkState(name != null, "%s not found in config. Use geogig config [--global] %s <your name> to configure it.", namekey, namekey); return name; }
private String resolveCommitter() { final String namekey = "user.name"; String name = getClientData(namekey, String.class) .or(command(ConfigGet.class).setName(namekey).call()).orNull(); checkState(name != null, "%s not found in config. Use geogig config [--global] %s <your name> to configure it.", namekey, namekey); return name; }
public @Override Optional<Ref> get() { return call(); } }
public BranchConfig delete() { this.delete = true; return call(); }
public CheckoutException(StatusCode statusCode) { super(statusCode.message()); this.statusCode = statusCode; }
/** * @return the timestamp to be used for the author */ public long getAuthorTimeStamp() { return authorTimeStamp == null ? getCommitterTimeStamp() : authorTimeStamp; }
static DiffTuple of(DiffEntry left, DiffEntry right) { return new DiffTuple(left, right); } //@formatter:on
@Test public void BranchIsHeadTest() throws Exception { insertAndAdd(points1); geogig.command(AddOp.class).call(); geogig.command(CommitOp.class).call(); geogig.command(BranchCreateOp.class).setName("TestMasterBranch").call(); geogig.command(BranchCreateOp.class).setName("TestBranch").call(); geogig.command(CheckoutOp.class).setSource("TestBranch").call(); insertAndAdd(points2); geogig.command(AddOp.class).call(); geogig.command(CommitOp.class).call(); exception.expect(IllegalArgumentException.class); geogig.command(BranchDeleteOp.class).setName("TestBranch").call(); }
private void verifyCancelledCleanly(RevCommit oldHeadCommit) { StatusSummary summary = geogig.command(StatusOp.class).call(); assertEquals(0, summary.getCountConflicts()); assertEquals(0, summary.getCountStaged()); assertEquals(0, summary.getCountUnstaged()); Iterator<RevCommit> log = geogig.command(LogOp.class).call(); assertTrue(log.hasNext()); assertEquals(oldHeadCommit, log.next()); }
@Override public AutoCloseableIterator<DiffEntry> iterator() { return call(); }
public BranchConfig get() { return call(); }
public CheckoutException(StatusCode statusCode) { super(statusCode.message()); this.statusCode = statusCode; }
public BranchConfig set() { return call(); }