private List<DiffEntry> getExpectedEntries(String layerName, String oldHead, String newHead) { AutoCloseableIterator<DiffEntry> diffs = repo.command(DiffTree.class) .setPathFilter(layerName).setOldVersion(oldHead).setNewVersion(newHead).call(); return Lists.newArrayList(diffs); }
@Test public void testInvalidNewVersion() { exception.expect(IllegalArgumentException.class); diffTree.setOldVersion(Ref.HEAD).setNewVersion("abcdef0123").call(); }
@Test public void testInvalidOldVersion() { exception.expect(IllegalArgumentException.class); diffTree.setOldVersion("abcdef0123").setNewVersion(Ref.HEAD).call(); }
@Test public void testInvalidNewVersion() { exception.expect(IllegalArgumentException.class); diffTree.setOldVersion(Ref.HEAD).setNewVersion("abcdef0123").call(); }
@Test public void testInvalidOldVersion() { exception.expect(IllegalArgumentException.class); diffTree.setOldVersion("abcdef0123").setNewVersion(Ref.HEAD).call(); }
@Test public void testNoCommitsYet() { assertFalse(diffTree.setOldVersion(Ref.HEAD).setNewVersion(Ref.HEAD).call().hasNext()); }
@Test public void testNoCommitsYet() { assertFalse(diffTree.setOldVersion(Ref.HEAD).setNewVersion(Ref.HEAD).call().hasNext()); }
private AutoCloseableIterator<DiffEntry> buildDiffEntries(GeogigCLI cli) { org.locationtech.geogig.plumbing.DiffTree diff = cli.getGeogig() .command(org.locationtech.geogig.plumbing.DiffTree.class); String oldVersion = resolveOldVersion(); String newVersion = resolveNewVersion(); diff.setOldVersion(oldVersion).setNewVersion(newVersion); AutoCloseableIterator<DiffEntry> diffEntries; if (paths.isEmpty()) { diffEntries = diff.setProgressListener(cli.getProgressListener()).call(); } else { diffEntries = AutoCloseableIterator.emptyIterator(); for (String path : paths) { AutoCloseableIterator<DiffEntry> moreEntries = diff.setPathFilter(path) .setProgressListener(cli.getProgressListener()).call(); diffEntries = AutoCloseableIterator.concat(diffEntries, moreEntries); } } return diffEntries; }
private AutoCloseableIterator<DiffEntry> buildDiffEntries(GeogigCLI cli) { org.locationtech.geogig.plumbing.DiffTree diff = cli.getGeogig() .command(org.locationtech.geogig.plumbing.DiffTree.class); String oldVersion = resolveOldVersion(); String newVersion = resolveNewVersion(); diff.setOldVersion(oldVersion).setNewVersion(newVersion); AutoCloseableIterator<DiffEntry> diffEntries; if (paths.isEmpty()) { diffEntries = diff.setProgressListener(cli.getProgressListener()).call(); } else { diffEntries = AutoCloseableIterator.emptyIterator(); for (String path : paths) { AutoCloseableIterator<DiffEntry> moreEntries = diff.setPathFilter(path) .setProgressListener(cli.getProgressListener()).call(); diffEntries = AutoCloseableIterator.concat(diffEntries, moreEntries); } } return diffEntries; }
private AutoCloseableIterator<DiffEntry> buildDiffEntries(GeogigCLI cli) { org.locationtech.geogig.plumbing.DiffTree diff = cli.getGeogig() .command(org.locationtech.geogig.plumbing.DiffTree.class); String oldVersion = resolveOldVersion(); String newVersion = resolveNewVersion(); diff.setOldVersion(oldVersion).setNewVersion(newVersion); AutoCloseableIterator<DiffEntry> diffEntries; if (paths.isEmpty()) { diffEntries = diff.setProgressListener(cli.getProgressListener()).call(); } else { diffEntries = AutoCloseableIterator.emptyIterator(); for (String path : paths) { AutoCloseableIterator<DiffEntry> moreEntries = diff.setPathFilter(path) .setProgressListener(cli.getProgressListener()).call(); diffEntries = AutoCloseableIterator.concat(diffEntries, moreEntries); } } return diffEntries; }
} else { iterator = command(DiffTree.class).setOldVersion(oldRefSpec).setNewVersion(newRefSpec) .setPathFilter(pathFilter).setReportTrees(reportTrees) .setPreserveIterationOrder(preserveIterationOrder).call();
} else { iterator = command(DiffTree.class).setOldVersion(oldRefSpec).setNewVersion(newRefSpec) .setPathFilter(pathFilter).setReportTrees(reportTrees) .setPreserveIterationOrder(preserveIterationOrder).call();
protected @Override List<DiffEntry> _call() { TreeChangesCollector collector = new TreeChangesCollector(); DiffTree diffTree = command(DiffTree.class)// .setPreserveIterationOrder(false)// .setReportFeatures(false)// .setReportTrees(true)// .setPathFilter(this.pathFilters)// .setLeftSource(leftSource)// .setRightSource(rightSource); if (oldTree != null) { diffTree.setOldTree(oldTree); } else if (oldTreeId != null) { diffTree.setOldTree(oldTreeId); } else { diffTree.setOldVersion(oldRefSpec); } if (newTree != null) { diffTree.setNewTree(newTree); } else if (newTreeId != null) { diffTree.setNewTree(newTreeId); } else { diffTree.setNewVersion(newRefSpec); } diffTree.call(collector); List<DiffEntry> res = new ArrayList<>(collector.queue); return res; }